all
sa;ldfjMerge branch 'master' of github.com:HrSerhiy/puppet

Conflicts:
	test3