resolving merge conflicts in hydra teleop
adding stand-alone wam60 calibration file
adding moi rescaling flag to world sdf
Update README.md
updating wam 60 calibration and creating calibration file for wm 40
Merge pull request #12 from svozar/patch-1

Update README.md
updating wam7 launchfile to use new calibration file
Merge branch 'master' of github.com:jhu-lcsr/lcsr_barrett
fixing lua hw scripts
updating configuration for WAM 40
Merge branch 'master' of github.com:svozar/lcsr_barrett_nasa into upstream
Merge branch 'master' into nasa-setup
Merge branch 'nasa-setup' of github.com:svozar/lcsr_barrett_nasa into nasa-setup