updated calculator
Merge branch 'master' of https://github.com/Mattsface/RubyWinter2014