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

Conflicts:
	sample.txt