Primo commit
Merge remote branch 'origin/master'

Conflicts:
	app/controllers/application_controller.rb
Primo commit