添加rainbow-delimiters
Merge branch 'master' of github.com:afeicool/.emacs.d

Conflicts:
	afei-rainbow-delimiters.el