backup
Merge branch 'master' into megviiDL-branch

Conflicts:
	.vimrc
update vimrc
adding head in py and updade tex
Merge branch 'master' of github.com:JackyRen/vimrc
update template path