第一篇搞定
Merge branch 'master' of github.com:gdqyn/gdqyn.github.io

Conflicts:
	_posts/2014-07-10-ubuntu-github-jekyll.md