Memory.py changed to MMU.py fixed to run with continous asignation
Merge pull request #22 from shuragrox/develop

Memory.py changed to MMU.py fixed to run with continous asignation
ContinuosAsignation Coded
Merge pull request #21 from cravacuore/develop

ContinuosAsignation Coded
Fixed cpu/io/program/instruction - Added irq/kernel/resourcesManager - Updated ToDo List
Merge pull request #23 from cravacuore/develop

Fixed cpu/io/program/instruction - Added irq/kernel/resourcesManager
Fixed cpu/io/program/instruction - Added irq/kernel/resourcesManager - Updated ToDo List
Merge pull request #24 from cravacuore/develop

Fixed cpu/io/program/instruction - Added irq/kernel/resourcesManager
Merge branch 'develop' of https://github.com/GrupoAcertijo/riddler into develop

Conflicts:
	src/mmu.py
	src/pcb.py