modify 3files
Merge pull request #9 from y-inoue-/conflict_test5_commit

modify 3files