changes
Merge branch 'master' of https://github.com/NicolasatHertie/FinalProject

Conflicts:
	fig2.png
	plotamelia.png