Not my commit
Merge branch 'master' of github.com:c3d2/cms

Conflicts:
	2014_03_19_schulinformatiktag/src/slides.tex