Hope this doesn't ruin anything
Merge pull request #2 from maceface/gh-pages

pulling and pushing