競合の再現
Merge branch 'master' of https://github.com/kohishi3/version1

Conflicts:
	readme.txt