Changed ShooterData and ShooterCalculator
Merge branch 'temp'

Conflicts:
	irs1318_2014_test/src/irs2014Test/shooterTest/SolenoidRunnerTest.java