Collision detection & gameover

Turning temporarily disabled because it made me unhappy.
merged master