Made data members private
Make data members private

Conflicts:
	Ship.java