before merge
Merge branch 'master' of https://github.com/blegat/LINMA2471-Devoirs
ralalalala
Merge branch 'master' of https://github.com/blegat/LINMA2471-Devoirs

Conflicts:
	2/report/report.tex
	2/report/robustFor1.tex
	2/report/robustFor2.tex
	2/report/robustSol.tex
rouge = urgent, orange = on en discute, vert = ok, bleu = osef