installed oh-my-zsh, really nice
Merge branch 'master' of https://github.com/smlb/dotfiles

Conflicts:
	.zshrc
Added some config