initial commit of django_project
Merge github.com:rchenmit/django_project