4.2 done
workshop.txt deleted
Merge branch 'master' of https://github.com/0ax1/dkrz_repo

Conflicts:
	main.c
	mpi.slurm
	testground.xcodeproj/project.xcworkspace/xcuserdata/a3z47u.xcuserdatad/UserInterfaceState.xcuserstate
	testground.xcodeproj/xcuserdata/a3z47u.xcuserdatad/xcschemes/testground.xcscheme