For this project, we'll use the standard Git-Flow workflow, http://nvie.com/posts/a-successful-git-branching-model/
To help with the Git Flow workflow, we'll use the Git Flow Cheatsheet: http://danielkummer.github.io/git-flow-cheatsheet/
For more info on workflows, read https://www.atlassian.com/git/tutorials/comparing-workflows
For commit messages, we'll use the following standard https://robots.thoughtbot.com/5-useful-tips-for-a-better-commit-message