Started tinkering with xml
Merge remote-tracking branch 'origin/master' into xml

Conflicts:
	res/index.js
Xml nearly working
Xml basically working, with bugs.