Added more tests to CalculatorTest
Added more Exception throwing to Calculator
Merge branch 'master' of https://github.com/lewismar/csc207-hw4