Calculator
Merge pull request #21 from ryanroberts1983/feature/mgamboa/2014-09-25/calculator

Calculator