「COMMIT!!」文字の追加
Merge branch 'master' of https://github.com/Furyu/sandbox

Conflicts:
	fuga.txt