fixed conflict in gitignore

RoccarasoFlight/postprocessing/AFD/descent_para_plot.mat

RoccarasoFlight/postprocessing/AFD/estimationCA.m

RoccarasoFlight/postprocessing/AFD/mainPostprocess.m

RoccarasoFlight/postprocessing/AFD/nasSim.mat

RoccarasoFlight/postprocessing/AFD/roccEngine.mat

RoccarasoFlight/postprocessing/AFD/src/roccEngine.mat

RoccarasoFlight/postprocessing/AFD/src/thrustBricolage.m

RoccarasoFlight/postprocessing/GNC/postProcess.m

...ht/postprocessing/RPS/cleanData/ROC2/engineFlightData.mat

RoccarasoFlight/postprocessing/RPS/configDataAnalyzer.m

RoccarasoFlight/postprocessing/RPS/dataAnalyzer.m

...soFlight/postprocessing/RPS/engineData/engines/CEA_db.mat

...light/postprocessing/RPS/engineData/engines/Furia/Furia.m

RoccarasoFlight/postprocessing/RPS/msaData/HREmotors.mat

RoccarasoFlight/postprocessing/RPS/msaEngineData.mat

...arasoFlight/postprocessing/RPS/src/combustionSimulation.m

RoccarasoFlight/postprocessing/RPS/src/dataLoader.m

RoccarasoFlight/postprocessing/RPS/src/massBalance.m

RoccarasoFlight/postprocessing/RPS/src/tankEvacuation.m

...rasoFlight/postprocessing/commonFunctions/atmosphereAlt.m