...
[.vimrc] ...
hgoe
Merge branch 'master' of github.com:rbtnn/vimrc

Conflicts:
	.gitignore
	.vimrc