Merge branch 'master' of https://github.com/ben336/scratchcalc
Merge branch 'master' of https://github.com/ben336/scratchcalc