added Expontiation ;)
Merge branch 'master' of https://github.com/roth28/lab7
fixed the conflict
Conflicts:
	calc.py