merge
Merge branch 'master' of https://github.com/Weil0ng/cs271

Conflicts:
	CmdInterpreter.py

bug fix