..
Merge branch 'master' of https://github.com/shsong97/django_blog

Conflicts:
	README.md