Merge branch 'master' of https://github.com/y-inoue-/github_sandbox
modify 3files
Merge pull request #7 from y-inoue-/conflict_test3_commit

Conflict test3 commit