allt kass
Merge branch 'master' of https://github.com/sploosch/tddd27

Conflicts:
	mysite/mysite/static/corman/css/calendar.css
	mysite/mysite/static/corman/home.html
	mysite/mysite/static/corman/partials/calendar.html