nouvelle intro
Merge branch 'master' of https://github.com/Melanie8/LINGI1122

Conflicts:
	theorie_du_probleme/rapport/main.log
	theorie_du_probleme/rapport/main.pdf
	theorie_du_probleme/rapport/main.synctex.gz