Rails 4.2.0.beta2  new project
Merge remote-tracking branch 'origin/master'

Conflicts:
	Gemfile
	Gemfile.lock
	README.md
	config/routes.rb