Merge branch 'master' of git.ece.iastate.edu:danc/MicroCART_17-18 into batch-setpid

controls/DataAnalysisTool/Tool/plot_multi.m

controls/DataAnalysisTool/Tool/plot_multi_vectors.m

controls/DataAnalysisTool/Tool/plot_separate.m

controls/DataAnalysisTool/Tool/plot_sub.m

controls/DataAnalysisTool/Tool/plot_sub_vectors.m

controls/DataAnalysisTool/Tool/sampleLogFile.txt

controls/DataAnalysisTool/Tool/sampleLogFileWithMarker.txt

controls/MATLAB/thrustAndDragConstant/calcDragConstant.m

controls/MATLAB/thrustAndDragConstant/calcThrustConstant.m

...AB/thrustAndDragConstant/thrustDragConstantCalculations.m

controls/MATLAB/zeroLoadCurrent/Kd_error.m

controls/MATLAB/zeroLoadCurrent/zeroLoadCurrent.m

...rols/dataCollection/Thrust and Drag Constant Data v2.xlsx

controls/dataCollection/loadCurrent.xlsx

controls/dataCollection/noLoadCurrentv2.xlsx

controls/model/Quadcopter_Model_R2016_B.slx

controls/model/modelParameters.m

controls/model/test_model.slx

controls/model/test_model_R2015A.mdl

controls/parameterIdentification/ModelingParameters.docx