deleted testPlacingABoatShouldPlaceABoatInTheModel() from ModelTest to fix conflict...
trying again