競合コミットテスト
Merge branch 'master' of https://github.com/dadajam4/dev01

Conflicts:
	sample.txt