modif rapport
Merge branch 'master' of https://github.com/barketplace/infomips

Conflicts:
	main