Remove *.o
Merge branch 'master' of https://github.com/ghiroma/TP4

Conflicts:
	Cliente/cliente
	Servidor Torneo/FuncionesServidorTorneo.o
	Servidor Torneo/ServidorTorneo