yay
Merge branch 'master' of https://github.com/clf9858a/ExemplesMoodleXML

Conflicts:
	MultipleChoiceQuestion.xml