fix collision
Merge branch 'master' of https://github.com/2645/shootEmAll