Hiiiii
Merge https://github.com/ashelleyPurdue/lab7Repo

Conflicts:
	calc.py