fixed merge fail
Merge branch 'master' of github.com:ArnoldSwaggernegger/Concurrency-Parallel-Programmeren

Conflicts:
	verslag3/verslag3.tex