2.1, 2.2
Merge branch 'master' of https://github.com/tanmn/kanri-gamen