Added the DisplacementInTons property to the Boat class.
Added the DisplacementInTons property, with modified comments.
Resolved changes in Boats class after megre conflict.