modified:   .vagrant/machines/default/berkshelf
	modified:   .vagrant/machines/default/virtualbox/action_provision
	modified:   .vagrant/machines/default/virtualbox/action_set_name
	modified:   .vagrant/machines/default/virtualbox/id
	modified:   .vagrant/machines/default/virtualbox/index_uuid
	modified:   .vagrant/machines/default/virtualbox/synced_folders
	modified:   Berksfile.lock
	modified:   attributes/default.rb
	modified:   attributes/default.rb~
	modified:   metadata.rb
	modified:   metadata.rb~
	modified:   recipes/webserver.rb~
Merge branch 'master' of https://github.com/jammy2704/mycookbook