Some changes
Some more editing
Finish
Merge branch 'oh-my-zsh-psto'