Test works now. YAY!
Merge branch 'master' of https://github.com/st3am/baxter_barcode_pickup

Screw your conflicts

Conflicts:
	baxter_barcode_pickup/package.xml