Merge branch 'master' of https://github.com/trollmcqueen/hellofortyone
Merge branch 'benji'
	modified:   anneau.c
	modified:   robot.c
	modified:   global.h