changes for heroku
changes for live2
Merge branch 'master' of github.com:jongoodey/new_tkr