some code mods
Merge branch 'master' of https://github.com/wilsonhighopensource13/pycalc

Conflicts:
	main.py

fix issues