merge test
Merge branch 'develop' of github.com:Takafumi-Yamashita/git_training into develop2