修改:         post/index.json
Merge branch 'master' of https://github.com/Ka-chanNi/kachan.github.io

Conflicts:
	post/index.json~