add newfile.txt
edit newfile
Merge branch 'feature/new-feature' into develop
great update
hi
edit
Merge branch 'feature/great-feature' into develop
Merge branch 'release/0.1-release'
Merge pull request #1 from mawatari/master

test