comentario Version 1.2 hector

probando merge
Merge remote-tracking branch 'origin/master'

Conflicts:
	Ejercicio8/modelo.php