6.1, 6.3 fixes
Merge branch 'master' of github.com:Faedrivin/DInf2014

Conflicts:
	blatt6/DInf146_shas.tex