Added lives and collision detection to ShipMovement
Merge branch 'master' of https://github.com/ssternklar/Imagine-Cup-Game