resolving merge conflicts in hydra teleop
Merge branch 'master' of github.com:cpaxton/lcsr_barrett
updated hydra teleop script to add left/right option
hydra side option not case sensitive any more