Merge pull request #1 from samwilliams312/master

soFJ
Merge pull request #2 from samwilliams312/gh-pages

Merge pull request #1 from samwilliams312/master