Changed launch file
Fixed merge conflict
Merge branch 'master' of https://github.com/nwotero/JNJ_Catering