Merge pull request #4 from PoopFeast6969/master

Merge Master into gh-pages.
Merge pull request #5 from PoopFeast6969/gh-pages

Merge pull request #4 from PoopFeast6969/master