k1
k6
bash1

bashcomment1
sample1

sample110
Merge branch 'testing'

Conflicts:
	hoge.txt
Merge branch 'master' into hayahide

Conflicts:
hoge.txt
Merge branch 'hayahide' into testing

Conflicts:
	hoge.txt
Merge branch 'testing' into hayahide
Merge branch 'master' into hayahide

Conflicts:
	hoge.txt
ready1

sample1
sameeee

sam123
Merge branch 'hayahide' of https://github.com/hayahide/Muz into hayahide

Conflicts:
	hoge.txt