Initial commit
提交站点
添加google
merge
修复合并冲突
Merge remote-tracking branch 'origin/gh-pages'
Merge remote-tracking branch 'origin/gh-pages'

Conflicts:
	index.html
	item/weibo.html