modificacione de nuevo....
rama nueva
Merge pull request #3 from KND-php/ramaprueba

Ramaprueba
controlador y modelo
Merge branch 'develop' of https://github.com/KND-php/aula into develop

Conflicts:
	Nuevo documento de texto.txt
Merge branch 'master' of https://github.com/KND-php/aula into develop
logre listar un par de usuarios
Merge pull request #6 from KND-php/feature/alta

Feature/alta