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

Conflicts:
	custom/alias.zsh
Merge branch 'master' of https://github.com/furieux/oh-my-zsh