ajout texte
Merge branch 'master' of https://github.com/florian86000/tpforma.git

Conflicts:
	tpforma/src/main/java/fr/gphy/m2/keuv/tpforma/App.java
Merge branch 'master' of https://github.com/florian86000/tpforma.git