added the php-fpm upstream server in nginx.conf
Merge branch 'master' of https://github.com/dylanlindgren/docker-nginx
modified files in github