Exponent
Merge branch 'master' of https://github.com/AcidBurn314/cs190patel

Conflicts:
	calc.py