更新配置
更新文件
Merge branch 'gh-pages'

Conflicts:
	public/2014/05/09/hello-world/index.html
	public/archives/2014/05/index.html
	public/archives/2014/index.html
	public/archives/index.html
	public/index.html