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

Conflicts:
	zsh/oh-my-zsh.link