added my name
aubrey pull request
erge branch 'master' of https://github.com/aubsabobs/calculator7 into aubsabobs-master

Conflicts:
	test.py