nginx updated
Merge branch 'master' of github.com:Daniel0524/dotfiles