switched to jekyll
Merge branch 'gh-pages'