New features to modify: CPU, clock, memory and UML
Merge branch 'develop' of https://github.com/GrupoAcertijo/riddler into develop

Conflicts:
	scheduler.py
Merge pull request #9 from shuragrox/develop

Develop