temp calendar
Merge branch 'master' of github.com:upenu/website

Conflicts:
	website/templates/website/calendar.html
	website/templates/website/index.html
	website/views.py