Heroku settings
Merge branch 'master' of heroku.com:limitless-plateau-3854

Conflicts:
	package.json