Merge branch 'gh-pages'
Merge pull request #1 from cj-wilson/master

Merge branch 'gh-pages'