modification de la classe text
gestion conflit
Merge branch 'develop' of github.com:jdugue/grammaire_langages into develop