Merge pull request #1 from kwantopia/staging

Initial Django project into master branch
updated minor
erge branch 'master' into staging