Uploaded code
Merge branch 'master' of https://github.com/dillmo/Calculator.git