no se
Merge branch 'master' of https://github.com/alroad/projet-javacance

Conflicts:
	target/m2e-wtp/web-resources/META-INF/maven/org.jacademie/projet-javacance/pom.properties