添加

测试
Merge branch 'source' of https://github.com/guoteng/guoteng.github.com into source

Conflicts:
	source/_posts/2014-04-29-new-post.markdown