Highlight current line
Merge branch 'master' of github.com:CQQL/dotfiles

Conflicts:
	src/.vimrc