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

Conflicts:
	plotamelia.png