Add nginx
Add mac-specific stuff
Add mac-specific
Merge branch 'master' of https://github.com/mmigdol/dotfiles

Conflicts:
	home/.profile