Added exponentiation
Merge branch 'master' of https://github.com/wdahlenburg/lab7

Conflicts:
	calc.py