modify Makefile
Merge branch 'master' of github.com:cpuex2014-4/simlator