Work.
Merge branch 'master' of github.com:moowiz/dotfiles

Conflicts:
	.zshrc