Add login
Add login, Modify views
Merge branch 'controllers' into vistas

Conflicts:
	application/routes/index.js
	application/views/registro.jade
Ultimo commit
Arreglado redirect
Updating vistas branch
Merge branch 'vistas' of https://github.com/zacr0/aplicacion-proyecto_integrado into vistas
Merge branch 'vistas' into controllers

Conflicts:
	application/routes/index.js
	application/routes/perfil.js