Merge pull request #1 from jhu-lcsr/master

Update from original
Merge branches 'master' and 'nasa-lua'
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 pull request #13 from svozar/upstream

Adding WAM 40 calibration
adding additional error checking for startup
Updated WAM 40 Calibration file
Merge branch 'master' into wam40-cal
Merge pull request #15 from svozar/wam40-cal

Update WAM40 Calibration File
Merge branch 'master' of github.com:jhu-lcsr/lcsr_barrett

Conflicts:
	lua/lcsr_barrett.lua
	lua/load_barrett.lua
new changes