improved calculator
Merge branch 'master' of https://github.com/lynx-envoy/Prog3_Testat1