宝箱修正
Merge branch 'master' of https://github.com/yosukeadachi/DGJ20140524