fixing some merging foo..  oops
fixing some merging foo..  oops

lanchun/myrobotlab,robojukie/myrobotlab,robojukie/myrobotlab,MyRobotLab/myrobotlab,MyRobotLab/myrobotlab,lanchun/myrobotlab,MyRobotLab/myrobotlab,robojukie/myrobotlab,MyRobotLab/myrobotlab,MyRobotLab/myrobotlab,MyRobotLab/myrobotlab,lanchun/myrobotlab,MyRobotLab/myrobotlab