Prepare for deploy on heroku
Merge branch 'master' of github.com:engineer/carteramagic