up to Chapter 7
Merge branch 'master' of https://github.com/ugik/django_test