fixed syntax errors
Merge branch 'master' of https://github.com/frc3324/Metrobots2014
fixed syntax errors