Added bin, build, and lib directories to gitignore.
Merge branch 'hs-demo'

Conflicts:
	.gitignore
Merge branch 'master' of 192.168.0.150:/home/abby/ros/dev_stacks/swri-ros-pkg

Conflicts:
	.gitignore
Hard-coded ABB joints into joint action server.
Merge branch 'master' of 192.168.0.150:/home/abby/ros/dev_stacks/swri-ros-pkg
Merge branch 'master' of github.com:evenator/swri-ros-pkg2