corrections
Merge branch 'master' of git@github.com:Goldenwing/TP3-BattleShips.git
.
Merge remote-tracking branch 'origin/master'