What
Merge remote-tracking branch 'origin/master'

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