...
Merge branch 'master' of https://github.com/projcompil/Guru

Conflicts:
	main.ml

Retrait des conflits.