Customize the kphoen theme
Merge branch 'master' of https://github.com/mstriemer/oh-my-zsh

Conflicts:
	themes/mstriemer.zsh-theme