Merge branch 'vistas' into controllers
Merge branch 'vistas' into controllers
Funciona el chat
Merge branch 'controllers' into vistas

Conflicts:
	application/views/salas.jade
Borra rastro de conflicto
Mejora vistas