merge
Merge branch 'master' of https://github.com/edison7500/blog

Conflicts:
	.idea/workspace.xml
	web_jiaxin/demo.db
	web_jiaxin/settings.py
	web_jiaxin/urls.py
update