add
Merge branch 'master' of https://github.com/okbm/chef_solo_berkshelf

Conflicts:
	site-cookbooks/base/recipes/default.rb