Fixed collision detection (still crappy)
Merge remote-tracking branch 'origin/master'