add changed
fix conflit
Merge branch 'master' of github.com:scottcarr/myvimconfig

Conflicts:
	.vimrc