first django version
Merge branch 'master' of github.com:anabelle/dont-panic