I hope you're happy now.
Saving slight changes between pulls
Merge https://github.com/robotics-silver-surfer/surfer-main

Conflicts:
	lab2/arbitrator/build/CMakeFiles/CMakeRuleHashes.txt
	lab2/reactivecontrol/build/CMakeCache.txt
Merge https://github.com/robotics-silver-surfer/surfer-main
Debugging for launch