updated calculator, using inject
updated calculator, using inject
Merge branch 'master' of github.com:Sgtpluck/tests
trying to get everything up to date