Merge branch 'decimal' of https://github.com/beck410/calculator into origin/decimal
fixed decimal
Merge pull request #2 from beck410/origin/decimal

Origin/decimal