Update Gemfile.lock for Heroku
Merge branch 'master' of heroku.com:intense-sands-9057

Conflicts:
	Gemfile