Work on collision system
Merge branch 'master' of github.com:benzap/Kampf