Login mockup
Merge branch 'master' of https://github.com/CMUStudentActivities/artspass

Conflicts:
	app/views/sessions/new.html.erb