Add ShipTest (jUnit test) and modify some methods in Ship
Merge branch 'master' of https://github.com/Pieter2406/OGP_assignment