solved conflicts (GNC)

.gitignore

README.md

RoccarasoFlight/data/ANEMOMOMETER/anemometerData.mat

RoccarasoFlight/data/PAYLOAD/.gitkeep

RoccarasoFlight/data/PAYLOAD/Boardcore_ADS131M08Data.csv

RoccarasoFlight/data/PAYLOAD/Boardcore_CpuMeterData.csv

RoccarasoFlight/data/PAYLOAD/Boardcore_EventData.csv

RoccarasoFlight/data/PAYLOAD/Boardcore_H3LIS331DLData.csv

RoccarasoFlight/data/PAYLOAD/Boardcore_HSCMRNN015PAData.csv

RoccarasoFlight/data/PAYLOAD/Boardcore_LIS2MDLData.csv

RoccarasoFlight/data/PAYLOAD/Boardcore_LPS22DFData.csv

RoccarasoFlight/data/PAYLOAD/Boardcore_LSM6DSRXData.csv

RoccarasoFlight/data/PAYLOAD/Boardcore_LoggerStats.csv

RoccarasoFlight/data/PAYLOAD/Boardcore_PitotData.csv

RoccarasoFlight/data/PAYLOAD/Boardcore_SSCMRNN030PAData.csv

RoccarasoFlight/data/PAYLOAD/Boardcore_StackData.csv

RoccarasoFlight/data/PAYLOAD/Boardcore_UBXGPSData.csv

RoccarasoFlight/data/PAYLOAD/Payload_LPS28DFW_1Data.csv

RoccarasoFlight/data/PAYLOAD/Payload_LPS28DFW_2Data.csv

RoccarasoFlight/data/PAYLOAD/Payload_NASControllerStatus.csv