validacion de la entrada de parametros
Merge branch 'master' of
https://github.com/jaatadia/Fiuba-_Concurrentes_2C_2014_Tp1

Conflicts:
	maestro/src/maestro.cpp