update
Merge branch 'gh-pages' of github.com:zhuping/jekyll_demo into gh-pages