some test #58
Merge branch 'master' of
https://github.com/JackDanny/projetDCLL_MoodleXML_Json

Conflicts:
	projet/src/main/java/main/Main.java