Merge branch 'master' of https://github.com/michellewkong/uw-exam

Conflicts:
	web/index.html
	web/js/calendar.js