delete public/assetes
delete public/assets
Merge branch 'develop'
Merge branch 'master' of https://github.com/doyomeki/matsuri2