Merge Completed Boat.java with master copy

Merge Completed Boat.java with master copy