modif bateau a testé
modif bateau a testé
Merge origin/master

Conflicts:
	src/partie/partie.java