buck up from mac
Merge branch 'master' of https://github.com/ock86/habutako

Conflicts:
	docs/cat/index.html