Merge branch 'master' of github.com:francisfueconcillo/gameofthegenerals
Heroku files