Expanded the Calculator class.
Created some tests for the Calculator class.
Merge branch 'master' of https://github.com/lewismar/csc207-hw4