Merge marina project in subdirectory marina/
[fleet.git] / marina / testCode / edu / berkeley / fleet / two / ShipDescription.java