Merge branch 'master' of https://github.com/y-inoue-/github_sandbox
modify
Merge pull request #4 from y-inoue-/conflict_test1

Conflict test1