tinkering
Merge branch 'cleanup'

Conflicts:
	calc.py
	parse.py
Merge branch 'master' into cleanup