up .vimrc
Merge branch 'master' of github.com:tw4452852/MyConfig

Conflicts:
	.vimrc