t
Merge remote-tracking branch 'choose_remote_name/master'

Conflicts:
	projet/pom.xml
	projet/src/main/java/main/Main.java
.gitignore & pom modif
Merge branch 'master' of
https://github.com/FlorentMouysset/projetDCLL_MoodleXML_Json

Conflicts:
	projet/pom.xml
modi pom file
Merge branch 'master' of https://github.com/JackDanny/projetDCLL_MoodleXML_Json