ajout simul dans machine.c
Merge branch 'dev' of https://github.com/bloodmaker/Pinoccio into dev

Conflicts:
	machine.c
Merge branch 'dev' of https://github.com/bloodmaker/Pinoccio into dev

Conflicts:
	machine.c