Created ShipyardTest.java
Merge origin/master
Created ShipyardTest.java
Merge origin/master
Finished Shipyard junit