running init and merge of wstool
Merge branch 'master' of github.com:garaemon/garaemon-settings

Conflicts:
	chef/site-cookbooks/jsk-ros/recipes/default.rb
updating repositories