Merge pull request #13 from lilweirdward/master

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

Merge pull request #13 from lilweirdward/master