Merge branch 'master' of https://github.com/robbyrussell/oh-my-zsh
Merging
Merge branch 'master' of github.com:twleung/oh-my-zsh

Conflicts:
	tools/upgrade.sh