三行目追加
Merge branch 'master' of https://github.com/ishiba/sample

Conflicts:
	sample.txt
マージ