Calendar
Merge branch 'master' of https://github.com/syoder15/CS98GroupProject
Calendar
Merge branch 'master' of https://github.com/syoder15/CS98GroupProject

Conflicts:
	cs98jam/jam/urls.py
New cal files
Merge branch 'master' of https://github.com/syoder15/CS98GroupProject