working on stm
Merge branch 'master' of https://github.com/acaddell/ARM_Sim

fix merge