1 调整了一下主题
2 测试了两边文章
Merge branch 'master' of github.com:fishcried/fishcried.github.io

Conflicts:
	index.md