improverd format of code in Spaceship
created class Shield
Merge branch 'master' of https://github.com/Kuxe/oopprojekt