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

Conflicts:
	protocol.h
Merge branch 'view' of https://github.com/ZiminGrigory/SeaBattle
chat is working now
Merge branch 'master' of https://github.com/EvgeniyMsk/SeaBattle into view

Conflicts:
	client/src/gameLogics/gameMaster.cpp
	protocol.h