neue farben \o/
new stuff
Merge branch 'master' of https://github.com/netzverweigerer/oh-my-zsh

Conflicts:
	aliases