barebones
Merge branch 'master' of https://github.com/mkopstals/django-blog-barebones

merging