cleared merging conflicts and added Vienna-header file support to the pressure.log reading
cleared merging conflicts and added Vienna-header file support to the pressure.log reading

AshleySetter/optoanalysis,markusrademacher/datahandling,AshleySetter/datahandling,AshleySetter/optoanalysis,AshleySetter/datahandling,markusrademacher/datahandling