init django commit
Merge branch 'master' of https://github.com/RyanPhillips10/3024u