django files
Merge branch 'master' of https://github.com/mooolen/CS198AEG

First merge