general changes from the tutorial
Merge branch 'master' of https://github.com/steviedons/django_test