tests
Merge branch 'master' of https://github.com/Glur4k/Battleship.git