pre merge	modified:   ex1.prolog
Merge branch 'master' of https://github.com/KevinHivert/Analyseur-Prolog

Conflicts:
	V2/ex1.prolog