version multifilaire - MAC
Merge branch 'master' of https://github.com/victorette/GIF-7104-TPs

Conflicts:
	openMP/Jimmy/sequential.cc