j en ai marre
Merge branch 'master' of
https://github.com/ElmahdiK/M1_MIAGE_S7_PROJET_XML.git

Conflicts:
	WebApp-XML/WebContent/hello.html
j en ai marre