2
Merge branch 'gh-pages' of https://github.com/sitoto/jekyll_sitoto into gh-pages