editited tex file in ftplugin
Merge branch 'master' of https://github.com/MaxSt/dotfiles

Conflicts:
	vimrc
merged