Sandrine updated notes on the Battleships.
pulled from upstream
mergeMerge remote-tracking branch 'upstream/master'
Player can place part of ship and shoot
hbcdhjbjhd:w
Merge remote-tracking branch 'upstream/master'
Merge pull request #7 from NicolePell/master

Player can place part of ship and shoot
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.
Refactored player class
Merge pull request #9 from NicolePell/master

Refactored player class
Merged all changes from upstream
Merge remote-tracking branch 'upstream/master'