merging
Merge branch 'h2r_affordances' of https://github.com/jmacglashan/burlap into h2r_affordances