Merge branch 'letsgetconflicts' into test-branch

Conflicts:
	Test.log
	Test.synctex.gz