kelseys first commit op button
Merge branch 'master' of https://github.com/cadencegail/calculatorFinal

Conflicts:
	calc.cpp