Merge branch 'master' of https://github.com/Noatino/trabajoFinal

Conflicts:
	codigo_implementacion/.#readXML.py
	codigo_implementacion/readXML.py
before