updated for my comp (Derrick)
Merge branch 'master' of https://github.com/sshum00/Django1