add reference image
fix conflict
removed ipython embed from tps_rpm_bij
S
Merge branch 'master' of github.com:ttblue/human_demos
add choose_demo and choose_seg args to do_task floating
merge changes