Initial commit
merge
Merge branch 'master' of https://github.com/colfr/Django_blog