stuff
Merge pull request #5 from scotts0rensen/gh-pages

stuff