sample.txt作成
Merge branch 'master' of https://github.com/shoutaterashita/gittest

Conflicts:
	sample.txt