machine.c
Merge branch 'master' of https://github.com/superCarton/projetFinSI3

Conflicts:
	Simul_Proc-linux-m64/Makefile
	Simul_Proc-linux-m64/test_simul
suppression des fichiers binaires
Merge branch 'master' of https://github.com/superCarton/projetFinSI3