First commit of django tutorial
Merge branch 'master' of https://github.com/fergyfresh/django_tutorial