Commented out the service file section
Fixed the conflict with Candell's edits to the service section
Merge branch 'master' of github.com:NIST-ICS-SEC-TB/my_youbot_moveit

Conflicts:
	CMakeLists.txt