Merge branch 'gh-pages'
ran Jekyll to generate site
Merge branch 'master' into gh-pages
index.html should be jekyll template
Merge branch 'master' into gh-pages