Merge pull request #1 from mikesherson/gh-page

Gh page
Merge pull request #2 from mikesherson/master

Merge pull request #1 from mikesherson/gh-page