Custom doodads or something idk
Nicer prompt
Merge branch 'master' of github.com:rrix/oh-my-zsh

merge is necessary,