Removed procfile for heroku
Merge remote-tracking branch 'origin/master'

Conflicts:
	config.ru
Removed procfile for heroku