k1
k6
sample1

sample110
Merge branch 'testing'

Conflicts:
	hoge.txt
Merge branch 'hayahide'
uuuu

uuiiii