Adding toString() methods to Num and Plus classes
Merge remote-tracking branch 'origin/master' into derek
Calculator.calculate() now takes a Stack instead of a List