a few edits
Merge branch 'master' of https://github.com/wilsonhighopensource13/pycalc

Conflicts:
	documentation.html
	sandboxgui.py

configuring all of these conflicts