Merge branch 'vistas' into controllers
Muestra el nickname del usuario conectado
Merge branch 'vistas' into controllers

Conflicts:
	application/app.js
	application/public/js/client.js
Merge branch 'vistas' into controllers

Conflicts:
	application/app.js
	application/public/js/salas.js
new file io.js
Merge branch 'vistas' into controllers
modified io
Merge branch 'controllers' into vistas
Introduce identaciones