7.2
7.2
Merge branch 'master' of https://github.com/Faedrivin/DInf2014
7.2
Merge branch 'master' of https://github.com/Faedrivin/DInf2014

Conflicts:
	blatt7/DInf147_shas.tex
7.2