testing
 test2
lesson 3
Merge branch 'testing'

Conflicts:
	Berksfile.lock
	cookbooks/webserver/attributes/default.rb