amar26

solved all problems except of calc->calculate method. Have not done test checks. it was not available in main branch. Later realized that available in other branch.