Detalles pre-pull
Merge branch 'master' of https://github.com/idkzx/Tarea2Redes_Server

Conflicts:
	src/tarearedes2_server/TareaRedes2_server.java