first test commit for tango with django 1.7
Merge https://github.com/itslong/tango_with_django_project