Changes to Ship

Accidentally synced ship.class instead of ship.java.
Also fixed the constructor error in ShipTest.java