collision resolution
Merge branch 'master' of https://github.com/LazerSharks/FriendlyFire