added nginx config
update readme
Merge branch 'nginx'