update marcus
update
Merge branch 'master' of https://github.com/matt-han/RCP

Conflicts:
	!Bericht/main.log
	!Bericht/main.pdf
	!Bericht/main.synctex.gz