Heroku stuff
Merge pull request #14 from Jonga/temp

Heroku stuff