Merge pull request #1 from devinnorris/master

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

Merge pull request #1 from devinnorris/master