"Commit before merger"
Merge branch 'master' of https://github.com/MattWellie/XML_Parser

Conflicts:
	XML_prototype.py
Merge branch 'master' of https://github.com/MattWellie/XML_Parser