Heroku ready

Conflicts:
	Gemfile
	Gemfile.lock
fix