Seperated the calculator method
Merge branch 'master' of github.com:Castlebranch/C--