tex
Merge branch 'master' of github.com:d2207197/.emacs.d

Conflicts:
	init.el
Merge branch 'master' of github.com:d2207197/.emacs.d

Conflicts:
	init.el
load tex-site if exists
Merge branch 'master' of github.com:d2207197/.emacs.d

Conflicts:
	init.el