Merge branch 'master' of https://github.com/garaemon/garaemon-settings
updating ros parameters
Merge branch 'master' of https://github.com/garaemon/garaemon-settings

Conflicts:
	chef/site-cookbooks/garaemon-settings/recipes/default.rb