Enleve les valeurs par defaults
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/wator/Shark.java
	src/main/java/wator/Tuna.java