Up
Merge branch 'master' of github.com:furieux/oh-my-zsh

Conflicts:
	custom/alias.zsh