Merge pull request #39 from abeyuya/moriguchi

Moriguchi
separate main and layout