Upgraded gems by rebuilding Gemfile.lock file
Upgraded Rails to 4.2.0.beta1
Merge branch 'master' of https://github.com/jasnow/sample_app_4_1

Conflicts:
	Gemfile
	Gemfile.lock