update
Merge branch 'master' of github.com:nbren12/dotfiles
Merge branch 'master' of github.com:nbren12/dotfiles

Conflicts:
	zsh/oh-my-zsh