CREATE YOUR OWN BRANCH (for everyone)
Be sure to create your own branch and push to that! if we have any merge conflicts, it will be a huge annoyance to fix merge conflicts in master so the best way is to have a stable version of the website on master branch and work in your own branch.
Remember before you merge your branch into master first PULL MASTER again and fix merge conflicts in YOUR branch.