Merge pull request #2 from gregdl/gh-pages

Something something
Merge pull request #3 from gregdl/master

Merge pull request #2 from gregdl/gh-pages