Merge pull request #3 from devinnorris/master

merger
Merge pull request #4 from devinnorris/gh-pages

Merge pull request #3 from devinnorris/master