ben
Merge branch 'master' of https://github.com/blegat/LINMA2471-Devoirs

Conflicts:
	2/code/main.run
Merge branch 'master' of https://github.com/blegat/LINMA2471-Devoirs

Conflicts:
	2/code/main.run
Merge branch 'master' of https://github.com/blegat/LINMA2471-Devoirs
ajout plot