preparing for Heroku deploy2
Merge branch 'master' of github.com:thm-design/pingbase