Fixes merged conflicts
Merge branch 'version2' of github.com:nyeeles/battleships into version2