commitの説明を追加
マージ

Merge branch 'master' of https://github.com/kaorun343/tutorial

Conflicts:
	sample.txt