smarter detection
added better acceleration
Merge branch 'collision-detection'
added back in explosions