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

cessary,
Merge branch 'gh-pages' of https://github.com/godlessfather/freenode-vegans into gh-pages