Prise en compte commentaire Joseph
Merge branch 'joseph'
Update main.tex
Merge remote-tracking branch 'upstream/master'
fix merge conflicts from master