login
Merge branch 'master' of git://github.com/Kenrick-Zhou/case4rom

Conflicts:
	app/views/users/signUp.html.erb