Merge branch 'hayahide'
uuuu

uuiiii
hayahide1

hayahide1
Merge branch 'master' into hayahide2

Conflicts:
	hoge.txt