initial project
Merge branch 'master' of https://github.com/hwyfour/djangotest