commit changes before pull
Merge branch 'master' of https://github.com/kjian279/RISC
fixed merge conflicts