our purple calc#16

RosmaryFC wants to merge 2 commits intoaccesscode-2-1:masteraccesscode-2-1/calculator:masterfrom

RosmaryFC:masterRosmaryFC/calculator:masterCopy head branch name to clipboard