Update Calc.cpp

files merged using a branch Sakshi