probe commit
Merge branch 'master' of https://github.com/cbadillac/labteleco

Conflicts:
	PreInforme/preinforme.tex