stole some stuff from @garybernhardt

Watch https://www.destroyallsoftware.com/screencasts/catalog/git-workflow for more info