Files created by "django-admin.py startproject blog"
Merge branch 'master' of https://github.com/electroreceptive/django-blog