wip
Merge branch 'master' of github.com:mar3/django.note
wip