Sandrine updated notes on the Battleships.
pulled from upstream
mergeMerge remote-tracking branch 'upstream/master'
Player can now remove ships by placing
Changed squares with cells
new board methods
Merge remote-tracking branch 'upstream/master'

added array init for grid
hbcdhjbjhd:w
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'

"new player methods"
Merge :w
Merge remote-tracking branch 'upstream/master'
Add incoming_shot method
cell can receive shot and report to ship
Merge pull request #8 from jamesascarter/master

Cell can receive shot and report to the ship.
Merge pull request #9 from NicolePell/master

Refactored player class
Player can tell board to place ships
Board can convert coordinates and place ships
Merged all changes from upstream
Merge remote-tracking branch 'upstream/master'
merge all changes from upstreamMerge remote-tracking branch 'upstream/master'
Merge pull request #10 from MadameSardine/master

Board can convert coordinates and place ships
commit master
Merge remote-tracking branch 'upstream/master'