123
solve problem with encoding on windows
Merge branch 'master' of https://github.com/EvgeniyMsk/SeaBattle

Conflicts:
	client/src/view/tabOfInformation.cpp