updating for pushing to heroku
Merge branch 'master' of github.com:uhray/boilerplate