modify
コンフリクト解消
Merge pull request #5 from y-inoue-/conflict_test2

Conflict test2