changed one of the numbers in ResetKicker2 to account for the new encoder.
Merge branch 'master' of github.com:frc2399/2014-code