123
commit text
Merge https://github.com/ZiminGrigory/SeaBattle
Merge branch 'view' of https://github.com/ZiminGrigory/SeaBattle
Merge branch 'view' of https://github.com/ZiminGrigory/SeaBattle
Merge https://github.com/EvgeniyMsk/SeaBattle
added smart ai class
Merge https://github.com/EvgeniyMsk/SeaBattle
Implementation for smart AI. It works now with one(diagonal) shoot strategy and serial squares choosing
shoot strategy files
square choosing now random
Merge branch 'master' of https://github.com/SunInJuly/SeaBattle

Conflicts:
	SeaBattle.pro
	client/client.pro
	client/src/gameLogics/gameMaster.cpp
Merge branch 'master' of https://github.com/SunInJuly/SeaBattle