同じく3行目を追加
Merge branch 'master' of https://github.com/koronpo/tutorial

Conflicts:
	sample.txt