Signed-off-by: jsabbatier <justine.sabbatier@imerir.com>
Merge branch 'master' of git@github.com:Python15/BadMonkey.git

Conflicts:
	Gestion projet/Projet intÃ©gration robotique â€“ IMERIR.pptx

Signed-off-by: jsabbatier <justine.sabbatier@imerir.com>