django_demo
Merge branch 'master' of github.com:ZhengRui/mysite