Minor change
Merge branch 'master' of github.com:blegat/LINMA1170

Conflicts:
	devoir4/Q1/q1.tex