simulator

Signed-off-by: Emil hein <Emil@10.16.96.180>
Merge branch 'master' of https://github.com/emilhein/16_CDIOFinal.git