Yo
Merge branch 'master' of https://github.com/gdscheele/COP3503-Calculator

Conflicts:
	main.cpp