new file:   caca
plop2
Merge branch 'benji'

Conflicts:
	robot.h

	modified:   robot.h
Merge branch 'benji'
	deleted:    caca
	modified:   composant.h
	modified:   main.c
	new file:   makefile
	deleted:    pipi
	modified:   robot.c
	modified:   robot.h