New changes
Merge branch 'master' of github.com:SeanHayes/my-django-app-template