-
Merge branch 'master' of https://github.com/dsounded/brain-portal

Conflicts:
	app/controllers/application_controller.rb
	app/views/session/login.html.erb