Resolved merge conflicts.

.gitignore

Makefile

corrvir/Makefile

corrvir/atopkge.c

corrvir/corr.h

corrvir/correlate.c

corrvir/corrvir.c

corrvir/demo/compvir_all.sh

corrvir/docpkge.c

corrvir/getFileInfo.c

corrvir/getpars.c

corrvir/par.h

corrvir/segy.h

corrvir/wallclock_time.c

doc/fdelmodcManual.pdf

fdelmodc/decomposition.c

fdelmodc/decomposition.c.new

fdelmodc/fdelmodc.c

fdelmodc/getParameters.c

fdelmodc/writeSnapTimes.c.org