Merge branch 'master' into groundStation-dev-comp_graph-commands

controls/DataAnalysisTool/Tool/DataAnalysis.m

controls/DataAnalysisTool/Tool/main.mat

controls/DataAnalysisTool/Tool/parse_log.m

controls/DataAnalysisTool/Tool/plot_data.m

controls/DataAnalysisTool/Tool/plot_multi.m

controls/DataAnalysisTool/Tool/plot_separate.m

controls/DataAnalysisTool/Tool/plot_sub.m

controls/model/c_controller.c

controls/model/c_controller.h

controls/model/loggingAnalysis/logAnalysis.m

controls/model/modelParameters.m

controls/model/parse_log_model.m

controls/model/quad_files/.gitignore

controls/model/quad_files/copy_files.bat

controls/model/test_model.slx