calculator func
Merge branch 'master' of github.com:stygeo/calculator
Removed 0 push on reset