testing profile setting
Merge branch 'master' of heroku.com:sportsfronter-heroku-test

Conflicts:
	Procfile