add .vimrc
Merge branch 'master' of https://github.com/sergli/my-env

Conflicts:
	.vimrc