modified all
Merge branch 'master' of https://github.com/amber-stubbs/CS330-Calc