Merge pull request #11 from lilweirdward/master

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

Merge pull request #11 from lilweirdward/master