add Hybrid colorscheme
Merge branch 'master' of https://github.com/liuyang1/dotfiles

Conflicts:
	urxvt/Xresources