Changes for Heroku
Merge branch 'master' of https://github.com/robquesada/pet-project