essai commentaire
Merge branch 'master' of https://github.com/cbremard/projetgl.git

Conflicts:
	projetGL/src/main/java/projet/fanny_corentins/projetGL/metier/Api.java
new version