no message
no message
Merge branch 'master' of https://github.com/okuma-toshinao/github-repo04

Conflicts:
	readme.txt