Merge pull request #3 from shrimpboyho/master

Stuff
Merge pull request #4 from shrimpboyho/gh-pages

stuff