dunno
fix des pb de merge sur tp_carac.tex
Merge branch 'master' of https://github.com/ChocoPouce/tp_carac