Added calculator stuff
Merge pull request #2 from derouinw/master

Added calculator stuff