Refactorisation et changement de regle du requin
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/main/Wator.java