fixed calendar of events
Merge branch 'master' of https://github.com/pooyh/compsci290s

Conflicts:
	calendar of events.csv