Finished ShooterCalculatorTest, not passing. Changes to
ShooterCalculator to interact with ShooterCalculatorTest.
Merge branch 'templ'