errores que no se capturaban
Merge branch 'master' of
https://github.com/jaatadia/Fiuba-_Concurrentes_2C_2014_Tp2.git

Conflicts:
	cliente/src/cliente.cpp