Client side self collision detection
Merge branch 'master' of https://github.com/mkantor/battle-cobras