Update Gemfile.lock for Heroku
Merge branch 'master' of https://github.com/baverio/first_app

Conflicts:
	Gemfile
	Gemfile.lock