updated naotaco
Merge branch 'master' of https://github.com/AreKai/Are2014Spring