Some random changes
Merge branch 'master' of https://github.com/sysdig-bla/simulateur

Conflicts:
	sim2/Makefile
	sim2/netlist_sim2.ml