tex
Merge branch 'master' of github.com:MaxSt/dotfiles

Conflicts:
	vim/UltiSnips/tex.snippets
	vimrc