Ultimo commit
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
Fusion
Solucion conexion mongoose modelo Promocion
Merge branch 'vistas' into controllers
Registro terminado
Cambios registro modificados
Merge branch 'controllers' into vistas

Conflicts:
	application/models/Usuario.js
	application/routes/index.js
	application/routes/perfil.js
Modify controladores