Merge pull request #12 from tyrellsys/yamada

まちがえない！
test
Merge branch 'master' into yamada