n
Merge branch 'master' of github.com:totomo/test
delete koko
add test2.txt
Merge branch 'test' of github.com:totomo/test into test