Added propertychange to spaceship so that it can have listeners.
Added the code needed for the thrusters.
Solved a mergeconflict