weekly calendar
Merge branch 'master' of https://github.com/cosc480somac/SOMACapp

Conflicts:
	log/development.log