Merge branch 'master' of https://gitlab.control.lth.se/farid/thesis

...obot/AugReaMarker/CamMark/camtomar/src/VisionControl.cpp~

MobileRobot/docking_data/Pose.txt

MobileRobot/docking_data/Pose.txt~

MobileRobot/docking_data/Pose2.txt

MobileRobot/docking_data/Pose2.txt~

MobileRobot/docking_data/Pose3.txt

MobileRobot/docking_data/Pose3.txt~

MobileRobot/docking_data/Vel.txt

MobileRobot/docking_data/Vel.txt~

MobileRobot/docking_data/Vel2.txt

MobileRobot/docking_data/Vel2.txt~

MobileRobot/docking_data/Vel3.txt

MobileRobot/docking_data/Vel3.txt~

MobileRobot/ej6.cpp

MobileRobot/ej6.cpp~