Saving lockfile
Removed duplicate route block
Merge remote-tracking branch 'upstream/master'

Conflicts:
	Gemfile.lock
	config/routes.rb