Midterm problem 1 - Calculator
Merge remote-tracking branch 'origin/master'