comit を追加
Merge branch 'master' of https://github.com/fyoshida/Tutorial

Conflicts:
	sample.txt