UCB Login Installed
Merge branch 'login'

Conflicts:
	app/assets/javascripts/application.js
	app/assets/stylesheets/application.css
	db/schema.rb