tuto加了第3行
Merge branch 'master' of https://github.com/bclxx12/tuto1

Conflicts:
	sample.txt
統合した