Merge branch 'master' of https://github.com/JanThorbecke/OpenSource

.gitignore

corrvir/correlate.c

doc/fdelmodcManual.pdf

fdelmodc/demo/fdelmodc_plane_txt.scr

fdelmodc/demo/matlab/FD_matlab_interface.m

fdelmodc/demo/matlab/test_matlab_interface.m

marchenko/demo/ScientificReports/README

marchenko/demo/ScientificReports/back_injrate_planes.scr

marchenko/demo/ScientificReports/backpropf2.scr

marchenko/demo/ScientificReports/check.scr

marchenko/demo/ScientificReports/clean

marchenko/demo/ScientificReports/direct.scr

marchenko/demo/ScientificReports/epsBack.scr

marchenko/demo/ScientificReports/initialFocus.scr

marchenko/demo/ScientificReports/marchenko.scr

marchenko/demo/ScientificReports/model.scr

marchenko/demo/ScientificReports/remove_direct.scr

marchenko/demo/ScientificReports/shotslurm.scr

marchenko/demo/test2/Joeri/mar.scr

marchenko/demo/test2/README