update
Merge branch 'master' of git@github.com:Goldenwing/TP3-BattleShips.git

Conflicts:
	Battleships-TP3/src/battleships/backend/ComputerPlayer.java
correction conflit
Merge remote-tracking branch 'origin/master'