merge
Merge branch 'master' of https://github.com/delanyinspiron6400/kernelpanicshared

Conflicts:
	NT-LAB/ÜbungD_Störverhalten/protocoll/root.pdf
:-)