commit
Merge branch 'master' of https://github.com/mvg2967/Python-Django

Merge because I didn't like how I ordered stuff!