Commit 1
Merge branch 'master' of https://github.com/dd2696/CS190Lab7

Conflicts:
	calc.py