from local
Merge branch 'master' of https://github.com/fumi-github/15h

Conflicts:
	readme5.txt