Tests pass
Merge branch 'dev' of https://github.com/elliottm/Battleships into dev