ejercicio
Merge branch 'master' of https://github.com/liesparza/Isa-Dora

Conflicts:
	www/config.xml
algo

tambien