ok
Merge branch 'master' of https://github.com/BarKetPlace/infomips
ok
Conflicts:
	main
	src/dico/dico.txt