Merge pull request #5 from samwilliams312/master

pull request 1
Merge pull request #6 from samwilliams312/gh-pages

Merge pull request #5 from samwilliams312/master