Added sensor output to feedback bridge, added sensor frames to launch file
Fixed merge conflict