Update Calculator.java

I scaled this back to the basics and will update tomorrow.
Merge pull request #1 from jstory/patch-1

Update Calculator.java