Merge pull request #1 from phillyc/master

deploy 1
Merge pull request #2 from phillyc/gh-pages

Merge pull request #1 from phillyc/master