latest changes
Merge branch 'maze-hitbox'
Merge branch 'master' of https://github.com/nothingless/incodr-caps2