Django girls 1.0
xMerge branch 'master' of https://github.com/boubafanta/lampadaires