first_commit
Merge branch 'master' of https://github.com/xjtu712-lab/TMSim1.0.1

Conflicts:
	NorSim.cpp