Updates
Merge branch 'master' of https://github.com/nzayatz14/BattleShipMaintanance

Conflicts:
	BattleshipFunctions.cpp