You can to modify your avatar
Merge branch 'vistas' into controllers
You can to modify your avatar
Improvements News
News problems
Agrega posible solucion error de subida
Agrega posible solucion de subida de imagen
Pull
Se muestran todas las salas
	Merge branch 'controllers' into vistas

Conflicts:
	application/io.js
	application/views/salas.jade