Updating nginx conf
Merge branch 'master' of https://github.com/golmansax/my-site