modified:   .vimrc
modified:   nighted.vim
Merge branch 'master' of git://github.com/Wolfdog666/config

Conflicts:
	.vimrc

merged conflict on .vimrc