merge
Merge branch 'master' of github.com:BafAltom/info-f403-project

Conflicts:
	report/rapport_Fusionnnnn.pdf