MyColor
Merge branch 'master' of github.com:magicdrive/vimfiles

Conflicts:
	vimrc