resolved conflicts

.gitignore

commonFunctions/control/EMguidance.m

commonFunctions/control/control_Interp.m

commonFunctions/control/control_Interp.prj

commonFunctions/control/setEMCpoints.m

commonFunctions/control/trajectoryChoice_mass.m

commonFunctions/graphics/README.txt

commonFunctions/graphics/general-utilities

commonFunctions/kalman/correctionPitot.m

commonFunctions/kalman/correctorQuat.m

commonFunctions/kalman/predictorLinear2.m

commonFunctions/kalman/run_WES.m

commonFunctions/kalman/run_kalman.m

commonFunctions/miscellaneous/animateOrientation.m

commonFunctions/miscellaneous/csvDataLogExtractor.m

commonFunctions/miscellaneous/manageSignalFrequencies.m

commonFunctions/miscellaneous/structCutter.m

commonFunctions/odeFunctions/ascentControl.m

commonFunctions/odeFunctions/descentParachute.m

commonFunctions/odeFunctions/descentParafoil.m