Done all the test for test_Calculator
Done editing the files
Merge pull request #25 from banana93/master

Done editing