colorscheme dump
eddie colorscheme
Merge remote-tracking branch 'origin/master'

Conflicts:
	gvimrc