fixed the shooter delay so it is ready for testing
Merge branch 'master' of https://github.com/phoenixfrc/Phoenix2014
merged the code