second change by wang
changes
Merge branch 'master' of https://github.com/wangsj96/cs190lab7

Conflicts:
	calc.py