Merge pull request #101 from zoepage/gh-pages

small egg
Merge remote-tracking branch 'upstream/gh-pages' into gh-pages