その競合ｘｘｘ３　sonoxxx3
Merge branch 'master' of https://github.com/yamakawa-akiyoshi/repo01

Conflicts:
	readme.txt