1er dico
Merge branch 'master' of https://github.com/BarKetPlace/infomips

Conflicts:
	main