error numero 1 solucionado
Merge branch 'master' of https://github.com/julentv/ChatServer.git