on vs
Merge branch 'vs'

Conflicts:
	CMDSim.suo
	CMDSim.vcxproj.user
delete
Merge branch 'vs'

Conflicts:
	CMDSim.suo
del branches
modify font
merge
modify action name