5 c und d
Merge branch 'master' of github.com:opatut/uni

Conflicts:
	ala/blatt07/ala-07.pdf
	ala/blatt07/ala-07.tex
Added pdf back in.