modified:   robot.h
plop
plop2
Merge branch 'benji'

Conflicts:
	robot.h

	modified:   robot.h
	new file:   pipi
Merge branch 'benji'
	modified:   pipi
	deleted:    caca
	modified:   composant.h
	modified:   main.c
	new file:   makefile
	deleted:    pipi
	modified:   robot.c
	modified:   robot.h
	modified:   composant.h
	modified:   robot.c
	modified:   robot.h
Merge branch 'master' of https://github.com/trollmcqueen/hellofortyone

Conflicts:
	composant.h
	pipi
	robot.c
	robot.h

	deleted:    caca
	modified:   composant.h
	modified:   main.c
	new file:   makefile
	deleted:    pipi
	modified:   robot.c
	modified:   robot.h