Prior to push to Heroku
Merge branch 'master' of https://github.com/oellph/sample_app