Git workflow:
- Clone repo
- Git checkout name-feature
- do your your stuff on name-feature branch
- git checkout dev
- git pull origin dev (pull most recent version of dev)
- git checkout name-feature branch
- git merge dev
- git push origin name-feature
- Go to github and make pull request (base: dev compare: name-feature)
- someone approves (hopefully...)! (can grab someone to screen share with to look over code before officially merging)