test
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/controllers/registrations_controller.rb
	app/controllers/sessions_controller.rb
	app/views/home/_top.html.erb
	config/routes.rb