takumi commit
コンフリクト解消
Merge pull request #1 from TORISOUP/takumi

takumi→master