Merge pull request #2 from shrimpboyho/master

Merge
Merge pull request #3 from shrimpboyho/gh-pages

merge