modified:   calc.py
Merge branch 'master' of https://github.com/sameerManchanda/lab7

Conflicts:
	calc.py