add nginx.conf
Merge branch 'master' of https://github.com/kitak/sample_app_spec_puppet

Conflicts:
	nginx.conf