commiting to pull
Merge branch 'master' of https://github.com/ysubtle/calculator
wip calculator.cpp