change permissions
Merge branch 'master' of https://github.com/arsham/oh-my-zsh

Conflicts:
	plugins/per-directory-history/per-directory-history.plugin.zsh
Merge branch 'master' of https://github.com/robbyrussell/oh-my-zsh
Merge branch 'master' of github.com:arsham/oh-my-zsh