Added object collision detection, and player lives