Merge pull request #1 from muimui12/master

もらいまーす
競合確認
a-
Merge pull request #6 from kitamoto731/muimui12-master

Muimui12 master