#0 Some private changes
Merge branch 'master' of github.com:blackwithwhite666/oh-my-zsh

Conflicts:
	.zshrc