regle conflit
Merge branch 'master' of git@github.com:Schokobons/GOOL.git

Conflicts:
	src/gool/test/GoolTest.java
beug laetis
Merge branch 'master' of git@github.com:Schokobons/GOOL.git
Merge branch 'master' of git@github.com:Schokobons/GOOL.git
Ajout classe PhpRecognizer.java