Update?
Merge branch 'master' of https://github.com/adb421/nxr_baxter_demo_package
Fixed a bunch of bugs. Have another big one before we are ready.