c
Merge branch 'master' of https://github.com/aslheyCO/programaton.git
Merge branch 'master' of https://github.com/aslheyCO/programaton.git
ajustes
Merge branch 'master' of https://github.com/aslheyCO/programaton.git

Conflicts:
	Registro.php