Cambio despreciable
Merge branch 'master' of https://github.com/Alberto-Vivar/Prueba-DISMANSOFT

Conflicts:
	README.md

Cambio