Calculator
Merge pull request #1 from Connector93/master

Calculator