Fixed bug with avoidance when carrying a block
Merge branch 'master' of https://github.com/mattgray7/DPMFinal.git
working odometry correction now?
Merge branch 'master' of https://github.com/mattgray7/DPMFinal.git
Included nick's recent push