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