modify 3files
Merge pull request #11 from y-inoue-/conflict_test7_commit

modify 3files