競合テスト
Merge branch 'master' of https://github.com/kurobuta/tutorial

Conflicts:
	sample.txt