Merge branch 'master' of github.com:KojiTakahara/SandBox
別あかうんとからのコミット
Merge branch 'master' of github.com:KojiTakahara/SandBox

Conflicts:
	newfile.txt
hogehoge
ぴよ
Merge branch 'master' of github.com:KojiTakahara/SandBox