JE met la hiperfeata
Merge branch 'master' of github.com:eve-amandine/Essai

Conflicts:
	hiperFeature.class