correct
Merge branch 'master' of
https://github.com/JackDanny/projetDCLL_MoodleXML_Json

Conflicts:
	projet/src/main/java/jsontoxml/xmlWriter/GenXML.java
	projet/src/main/java/main/Main.java
Correction #69
Merge branch 'master' of
https://github.com/JackDanny/projetDCLL_MoodleXML_Json

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