OK
OK
Merge branch 'Salut'

Conflicts:
	src/main/java/IUT/BoBot/SmartCells/SalutCell.java