merge
Merge branch 'master' of https://github.com/ghiroma/TP4

Conflicts:
	Servidor Partida/ServidorPartida
Fixes cierre y eliminacion