Merge final file.

Ship.java is now fully up to date