Cambios
Merge branch 'master' of https://github.com/jlogzz/HITECFEST

Conflicts:
	registro.php