für den pull
Merge branch 'master' of https://github.com/gravion/CoursesSS14.git

Conflicts:
	Proseminar Algorithmen/vortrag/main.log
	Proseminar Algorithmen/vortrag/main.pdf
	Proseminar Algorithmen/vortrag/main.synctex.gz
Merge branch 'master' of https://github.com/gravion/CoursesSS14.git
so muss das