vimrc
Merge branch 'master' of github.com:ziegs/vimrc
Merge branch 'master' of github.com:ziegs/vimrc

Conflicts:
	vimrc