Trying things.
Merge branch 'master' of https://github.com/ShivanKaul/McCalendar

Conflicts:
	mysite/courses/models.py
	mysite/courses/models.pyc