Mise à jour
Merge branch 'master' of http://github.com/gregaou/xml

Conflicts:
	master.html
	master.xsl