setup for deploy to heroku
bundle for heroku
Merge branch 'heroku'