Calculator
Merge branch 'master' of github.com:mshahbax/calculator