4-2くらい
Merge branch 'master' of github.com:sample-group/testes

Conflicts:
	hoge.cc