new file:   hoge.c
deleted:    hoge.cc
Merge branch 'master' of github.com:sample-group/testes

Conflicts:
	hoge.cc