First commit
Merge branch 'master' of https://github.com/Koff/tango-with-django