競合元
Merge branch 'master' of https://github.com/iccha/test

Conflicts:
	sample.txt