fixes to launch file, also updates to CMakelists
Merge branch 'user_interface' of https://github.com/CS6751/Jarvis into user_interface