Changes?
Merge branch 'master' of https://github.com/jjoos/oh-my-zsh

Conflicts:
	themes/jjoos.zsh-theme