追加
Merge pull request #9 from Nodoka0511/fuga

追加
conflict解消