tested on robot
fixed merge conflicts
previous homeworks
Merge branch 'master' of https://github.com/peterxu422/RoboticsVision