fixing conflicts
Merge branch 'dev' of github.com:arkiver/hybrid_microkernel_simulator into dev

Conflicts:
	Hybrid Microkernel/src/hybrid_mircokernel/Cpu.java