modified:   roomba_robin/package.xml
	modified:   roomba_robin_bringup/package.xml
	deleted:    setup_roomba.sh
	new file:   setup_robin.sh
Merge branch 'hydro-devel' of https://github.com/robinJKU/roomba_robin into hydro-devel

Conflicts:
	roomba_robin/package.xml

	modified:   package.xml