F-2
F-2
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/fr/univaix/iut/pokebattle/smartcell/PokemonCriesCell.java
	src/test/java/fr/univaix/iut/pokebattle/bot/PokeBotTest.java