some changes
Merge branch 'master' of https://github.com/s22l1g11/jCalculator