cc
Merge branch 'dev-kadir' of https://github.com/turpgames/ichigu into dev-kadir