name and email
Merge branch 'master' of https://github.com/Yamabiko/dai-fugo