first commit
Merge https://github.com/ljtheminister/django_tutorial