Fix
Merge branch 'master' of https://github.com/TeamBattleShip/ProjectBattleShip

Conflicts:
	BattleShipProject/src/graphicaluserinterface/GameGUI.java