Merge branch 'master' of https://github.com/robbyrussell/oh-my-zsh into custom_theme
Merge branch 'custom_theme' of github.com:revathskumar/oh-my-zsh into custom_theme