Merge pull request #1 from shrimpboyho/gh-pages

Merge
Update index.html
Merge pull request #2 from shrimpboyho/master

Merge