変更！
Merge branch 'master' of https://github.com/tomo46/test_pure

Conflicts:
	ichikawa.txt