Added Car.java
Added Boat.java
Merge branch 'boat'