template for nginx setting
Merge branch 'master' of github.com:matthewfu/production_server

Conflicts:
	confs/nginx/nginx.conf
	inits/nginx/nginx.erb
	install_server.rb