minor changes
solving conflicts
Merge branch 'master' of https://github.com/ah450/RiSC-16-Simulator

* 'master' of https://github.com/ah450/RiSC-16-Simulator:
  fix compile errors