finish it
Merge branch 'master' of https://github.com/BBBOND/Calculator.git