Merge remote-tracking branch 'origin/gh-pages'

Conflicts:
	README.md
Merge branch 'gh-pages' of https://github.com/groundh0g/FannyPack

Conflicts:
	README.md