Saving changes for merge
Merge branch 'master' of https://github.com/KaseyGrubb/Lab7

Conflicts:
	calc.py