foil prelim
Merge branch 'master' of https://github.com/COP3503group92/CalculatorProject.git