pushing django stuff
Merging django stuff
Merge branch 'master' of https://github.com/npeprah/shadow