my fourth commit
Merge branch 'master' of https://github.com/deFraG92/ShipBattle-Test-

Conflicts:
	ShipBattle(WCF)/ShipBattle(WCF)/ShipBattle(WCF)/CLient1/Form1.Designer.cs
	ShipBattle(WCF)/ShipBattle(WCF)/ShipBattle(WCF)/CLient1/Form1.cs
	ShipBattle(WCF)/ShipBattle(WCF)/ShipBattle(WCF)/CLient1/Game.cs
	ShipBattle(WCF)/ShipBattle(WCF)/ShipBattle(WCF)/CLient1/GameController.cs
	ShipBattle(WCF)/ShipBattle(WCF)/ShipBattle(WCF)/CLient1/Graphics/Drawing.cs
	ShipBattle(WCF)/ShipBattle(WCF)/ShipBattle(WCF)/CLient1/Shooting/Shoot.cs
	ShipBattle(WCF)/ShipBattle(WCF)/ShipBattle(WCF)/GameUtils/Coordinates.cs
	ShipBattle(WCF)/ShipBattle(WCF)/ShipBattle(WCF)/GameUtils/GameUtils.csproj
My Fourth commit