Merge pull request #1 from maceface/gh-pages

I hope this doesn't mess anything up
Merge pull request #2 from maceface/gh-pages

pulling and pushing
Merge pull request #3 from maceface/master

don't know what I'm doing