add nginx conf
Merge branch 'master' of github.com:misogi/settings

Conflicts:
	dot.gitconfig