exp functionality
Merge branch 'master' of https://github.com/TShulse/calc

Conflicts:
	calc.py