Robot, small changes
Merge branch 'master' of https://github.com/niive12/CupCollector
Robot: Compilable version, minor changes