extra line
Merge branch 'master' of github.com:jfrazelle/.vim

* 'master' of github.com:jfrazelle/.vim:
  extra line

Conflicts:
	vimrc.txt