Configured for deployment to Heroku
Conflicts:
	Gemfile
	Gemfile.lock
Conflicts:
	Gemfile
	Gemfile.lock