modified:   README.md
commit
Merge branch 'master' of github.com:sample-group/testes
Merge branch 'test'

Conflicts:
	README.md
hoge