try to update config to let heroku work
try to fix config let heroku work (remove sinatra reloader)
try to fix config to let app work on heroku(remove gem "thin")
try to fix config file to let app work on heroku
Merge remote-tracking branch 'heroku/master'

Conflicts:
	Gemfile
	main.rb