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

Conflicts:
	Servidor Partida2/FuncionesServidorPartida.cpp
Merge branch 'master' of https://github.com/ghiroma/TP4