chapter 9
Merge branch 'master' of github.com:uphillian/advpup

Conflicts:
	09/nginx/manifests/server.pp