conflict commit
Merge branch 'master' of https://github.com/makoto-suwabe/tutorial

Conflicts:
	sample.txt