Created ShipyardTest.java
Merge origin/master