miss fixed
Merge branch 'development' of github.com:BobRazoswki/Battleships into development
try to fix merge conflict