main file conflict fix
Merge branch 'dev' of git@github.com:arkiver/hybrid_microkernel_simulator.git into dev
Merge branch 'dev' of git@github.com:arkiver/hybrid_microkernel_simulator.git into dev
Cleaned up kernel and Message