merge heroku and git
Merge branch 'master' of https://github.com/makersquare/hatch-template