添加nginx.conf文件
Merge branch 'master' of github.com:duanyong/dot38