add nginx puppet module
Merge branch 'master' of github.com:bastien03/benchmark

Conflicts:
	README.md