Adjusted variables.
Merged Flo's code
Merge branch 'master' of https://github.com/eddy-geek/roboteamlg