minnor
Merge branch 'master' of https://github.com/g79664/Simple-Calculator

Conflicts:
	Simple Calculator/Simple
Calculator.xcodeproj/project.xcworkspace/xcuserdata/Tyler.xcuserdatad/Us
erInterfaceState.xcuserstate