vision plelims
Merge branch 'master' of github.com:RoboArmadillo/3dRoboSim
adjusted semantics of token and marker, added lists for both