first 18 17:38
Merge branch 'master' of github.com:serandres/django-tutorial

pull master repo