change vimrc
Merge branch 'temp'

Conflicts:
	.vimrc