Updated nginx.conf and README.MD
Merge branch 'master' of https://github.com/joncody/nginx