Merge branch 'vistas'
Merge branch 'vistas'
Merge branch 'vistas'
Merge branch 'controllers'
Add io file
Merge branch 'controllers'

Conflicts:
	application/io.js
Merge branch 'vistas'

Conflicts:
	application/io.js
Merge branch 'vistas'
Merge branch 'vistas'
Merge branch 'controllers'
Merge branch 'vistas'
Merge branch 'master' of https://github.com/zacr0/aplicacion-proyecto_integrado
Merge branch 'vistas'
Merge branch 'master' of https://github.com/zacr0/aplicacion-proyecto_integrado
Merge branch 'vistas'
Merge branch 'master' of https://github.com/zacr0/aplicacion-proyecto_integrado
Merge branch 'master' into controllers
Bug corregido y app bien estructurada
Merge branch 'controllers'
Aplicacion bien estructurada