changes
Merge branch 'master' of https://github.com/NicolasStevens/Optimisation2

Conflicts:
	Devoir3/Code/run.m