au revoir
salut
Merge branch 'salut' into V1
salut
Merge branch 'salut' into V1
Merge branch 'master' of https://github.com/voquy/BoBot

Conflicts:
	src/main/java/IUT/BoBot/Bot.java