Merge branch 'master' into solution
use the opponent name interface
Merge remote-tracking branch 'origin/solution' into ship-placement
dont allow to place ships on other ships
use api correctly
Merge branch 'ship-placement' of github.com:djungowski/node-battleship into ship-placement