django all working
Merge branch 'master' of https://github.com/bolivier/General

merging because it told me too....not really sure why.