fix
con joint state publisher
Merge branch 'master' of github.com:RCPRG-ros-pkg/irp6_robot

Conflicts:
	.gitignore
Merge branch 'master' of https://github.com/mwegiere/irp6_robot

Conflicts:
	.gitignore