commit 2
Merge branch 'gh-pages' of https://github.com/RodZhang/jekyll_demo into gh-pages

Conflicts:
	test.txt