Added camera boom deploy, however this is not running code because controller.close() isn't implemented
Fixed merging after computer crash
Merge branch 'ric' of https://github.com/thericcer/RobotRepo into ric

Conflicts:
	CMakeLists.txt
	controller/controller.cpp
	controller/controller.hpp