modificaciones
Merge remote-tracking branch 'origin/master'

Conflicts:
	public_html/formulario.html
Merge branch 'master' of https://github.com/hellboyf/PracticaFinal-Hipica