Merge pull request #1 from adamprescott/gh-pages

gh-pages :D
Merge pull request #140 from adamprescott/master

Merge pull request #1 from adamprescott/gh-pages