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

Conflicts:
	projet/src/main/java/jsontoxml/jsonParser/JsonParserImpl.java
#68
Merge branch 'master' of https://github.com/JackDanny/projetDCLL_MoodleXML_Json