Added som zsh-plugins and made my own theme
Merge branch 'master' of https://github.com/hiasen/dotfiles

Conflicts:
	zshrc