solve merge conflicts
Merge branch 'raspberry' of https://github.com/Fareroo7/SmartRobot.git into raspberry