renamed
Merge branch 'master' of github.com:leifos/tango_with_django