commit インデックスの状態を記録する
Merge branch 'master' of https://github.com/kogakunio/tutorial

Conflicts:
	sample.txt
修正
Merge branch 'master' of https://github.com/kogakunio/tutorial

Conflicts:
	sample.txt