commit
Merge branch 'master' of https://github.com/nagaaym/projet2

Conflicts:
	formule.ml
merge done