refs #52 two layouts to a layout
Merge branch 'master' of https://github.com/doyomeki/matsuri2