simple calculator
Merge branch 'master' of https://github.com/crysp17/MITx