tutorial django
Merge branch 'master' of github.com:Marceee/djangoprog