Time to get started on messing with people's calendars
Merge branch 'master' of github.com:lthrock/cs147_project

Conflicts:
	app.js