0.5.3
Merge branch 'master' of https://github.com/Pilotchik/sea_battle_oop

Conflicts:
	.idea/workspace.xml