Merge pull request #15 from lilweirdward/master

stuff
Merge pull request #16 from lilweirdward/gh-pages

Merge pull request #15 from lilweirdward/master