updated variable names
Small update
Merge branch 'master' of https://github.com/amesrobotics/2013robot.git
Fixed conveyer