ajout wrapper et preemption
Merge remote-tracking branch 'origin/master'

Conflicts:
	rapport/rapport_16mai.tex