adding nginx
Merge branch 'master' of github.com:danbickford007/dotfiles

Conflicts:
	.vimrc