Añadido multi
Merge branch 'master' of https://github.com/GenisDiaz/Practica.git

Conflicts:
	index.php