django stuff
Merge branch 'master' of https://github.com/stran53/cos333