first commit
Merge branch 'master' of github.com:assaulter/dotfiles

Conflicts:
	.zshrc
	Brewfile
	README.md
	Rakefile
	git/gitconfig_global