Se modularizo el servidor

....
Merge remote-tracking branch 'origin/master'

Conflicts:
	workspace/Tarea/src/Cliente/Client.java
Revert "Se modularizo el servidor"

This reverts commit fdefd2b1b68776c9ed0d01813bc40bf0a4ae4537.

Conflicts:
	workspace/Tarea/src/Cliente/Client.java