Commit 0
Merge branch 'master' of https://github.com/joshsmith2/playing_django