Initial django commit
Merge branch 'master' of github.com:Kae7in/cs373-idb