My first commit to my first Django project
Merge branch 'master' of https://github.com/sbrodkey/mysite2