grc.conf and zsh theme
24-bit colors in zsh theme
Merge branch 'master' of github.com:edestler/dotfiles

Conflicts:
	vimrc