Merge branch 'maze-hitbox'
Merge branch 'maze-hitbox'

Applied
Merge branch 'maze-hitbox'
Merge branch 'maze-hitbox'
Merge branch 'maze-hitbox'
Merge branch 'maze-hitbox'
'hrddfgdfg';
test
test.fnt
'dfsdfds'
Merge branch 'maze-hitbox2'
Merge branch 'master' of http://github.com/nothingless/incodr-caps2 into maze-hitbox2
'sad'
'sdfds'