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

Conflicts:
	sample.txt