changes
Merge branch 'master' of github.com:tmalloy/dotfiles

Conflicts:
	.oh-my-zsh