Pequeños cambios
Merge remote-tracking branch 'origin/vGaby'

Conflicts:
	hola.php
Merge branch 'master' of https://github.com/ajlucena/pruebas.git

Conflicts:
	hola.php