little fix
Merge branch 'view' of https://github.com/ZiminGrigory/SeaBattle

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

Conflicts:
	client/src/gameLogics/aiPlayerSimple.cpp
	client/src/gameLogics/aiPlayerSimple.h
	client/src/gameLogics/player.h
Computer attacks and kill big ships well!
forgot  player
add delay to ai attacks
now player can't attack single cell several times & should wait enemy turn before attack new cell
timeout of turns was implemented
Merge branch 'master' of https://github.com/EvgeniyMsk/SeaBattle into view

Conflicts:
	client/src/gameLogics/aiPlayerSimple.cpp
	client/src/gameLogics/aiPlayerSimple.h
	client/src/gameLogics/humanPlayer.cpp
	client/src/gameLogics/humanPlayer.h
	client/src/gameLogics/player.h
Merge branch 'master' of https://github.com/SunInJuly/SeaBattle into view

Conflicts:
	client/src/gameLogics/aiPlayer.h
	client/src/gameLogics/aiPlayerSimple.h
	client/src/gameLogics/player.h