Merge pull request #1 from gary-pei/master

Bare django project