Merge pull request #1 from tylersnyder/gh-pages

stuff
Merge pull request #2 from tylersnyder/master

Merge pull request #1 from tylersnyder/gh-pages