fixed merge - used remote version of code
fixed merge - used remote version of code

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