Dit is strijdig
Merge branch 'letsgetconflicts' into test-branch

Conflicts:
	Test.log
	Test.synctex.gz
Merge branch 'test-branch' into letsgetconflicts

Conflicts:
	Test.log
	Test.synctex.gz
	Test.tex