agrego Asientos que maneja la memoria compartida en la calesita, y su
uso desde el ninio
Merge branch 'master' of
https://github.com/jaatadia/Fiuba-_Concurrentes_2C_2014_Tp1

Conflicts:
	ninio_p/src/ninio_p.cpp
Merge branch 'master' of
https://github.com/jaatadia/Fiuba-_Concurrentes_2C_2014_Tp1

Conflicts:
	maestro/src/maestro.cpp
	ninio_p/src/ninio_p.cpp
Merge branch 'master' of https://github.com/jaatadia/Fiuba-_Concurrentes_2C_2014_Tp1
Merge branch 'master' of
https://github.com/jaatadia/Fiuba-_Concurrentes_2C_2014_Tp1