conflict everywhere
Merge branch 'master' of github.com:IljaKroonen/ExemplesMoodleXML