Registrar tipo de Token
Merge origin/master
Cambios y resolver conflictos
Cambios y resolver conflictos
Merge origin/master

Conflicts:
	formulario_registro.php
	registro.php
Merge origin/master
Merge origin/master

Conflicts:
	formulario_registro.php
	registro.php