commit の説明を追加
Merge branch 'master' of https://github.com/mk7104/tutorial

Conflicts:
	sample.txt