Merge branch 'HEAD' of git@github.com:kobake/enchant.fish.git

Conflicts:
	img/scnum8x8-z9.gif