blob
blob2
gem mod
helper
appctrl1
Merge origin/master

Conflicts:
	app/controllers/application_controller.rb