añado a master la carpeta de src de multi2sim-devel
recupero varios archivos que habia sobre escrito en el commit anterior
Merge branch 'master' of https://github.com/siscof/multi2sim-4.2 into mshronmiss_soloread

Conflicts:
	src/mem-system/nmoesi-protocol.c
Merge branch 'mshronmiss_soloread' of https://github.com/siscof/multi2sim-4.2 into mshronmiss_soloread

Conflicts:
	src/mem-system/nmoesi-protocol.c