Merge pull request #12 from matthewwolfe/gh-pages

merge gh-pages back to master