User login
Merge branch 'master' of github.com:aaronlifshin/meetingpulse

Conflicts:
	app.yaml
	html/front.html
	html/loginModal.html
	html/report.html
Committing to merge with Peter
Merge branch 'master' of github.com:aaronlifshin/meetingpulse

Conflicts:
	html/attendee.html
	html/report.html