Server mini-chat
Merge branch 'master' of https://github.com/KeoH/prueba3