Merge branch 'gh-pages' of https://github.com/huangyicheng/jekyll_demo into gh-pages