noah adds the calendar
Merge branch 'master' into calendar-stuff

Conflicts:
	config/routes.rb
Merge pull request #1 from Jessica-L/calendar-stuff

noah adds the calendar