version : 1.0.0

hexo测试
o Please enter the commit message for your changes. Lines starting
Merge branch 'master' of github.com:spheee/spheee

测试
Conflicts:
	.gitignore