Added a calendar and removed it.
Merge branch 'master' of https://github.com/Glchriste/Tutoring-Application

Conflicts:
	portal/views.py