fix for live site
Merge branch 'master' of
git@github.com:alexlittle/django-learning-modules.git

Conflicts:
	views.py