displayoceanS
fixed

Conflicts:
	BattleShip/Program.cs
	BattleShip/bin/Debug/BattleShip.exe
	BattleShip/bin/Debug/BattleShip.pdb
	BattleShip/obj/Debug/BattleShip.exe
	BattleShip/obj/Debug/BattleShip.pdb
confict

Conflicts:
	BattleShip/bin/Debug/BattleShip.exe
	BattleShip/bin/Debug/BattleShip.pdb
	BattleShip/obj/Debug/BattleShip.exe
	BattleShip/obj/Debug/BattleShip.pdb