local2
mata
koko
Merge branch 'local2'

Conflicts:
	hoge.txt