mjc compiling
Merge branch 'master' of https://github.com/sysdig-bla/simulateur

Conflicts:
	montre/Makefile