Remove heroku gem. Use heroku toolbelt instead: https://toolbelt.heroku.com/
Merge from origin. Remove heroku gem
Move files to app folder
Merge branch 'app-folder' of github.com:taktran/sinatra-bootstrap into app-folder