Merge branch 'master' of git.ece.iastate.edu:danc/MicroCART_17-18 into quad-impl-lidar

.gitlab-ci.yml

ci-build.sh

ci-test.sh

controls/MATLAB/momentOfInertia/J_calc_bifilar.m

controls/MATLAB/momentOfInertia/J_calc_bifilar_script.m

...lar_inertia_2_18_2017/MicroCART_bifilar_Jxx_2_18_2017.mat

...lar_inertia_2_18_2017/MicroCART_bifilar_Jyy_2_18_2017.mat

...lar_inertia_2_18_2017/MicroCART_bifilar_Jzz_2_18_2017.mat

controls/dataCollection/bifilar_inertia_2_18_2017/info.txt

controls/model/modelParameters.m

controls/model/test_model.slx

controls/model/test_model_R2015A.mdl

controls/model/test_model_R2015Ax.slx

quad/ci-build.sh

quad/ci-test.sh

quad/sw/modular_quad_pid/.build_app.tcl

quad/sw/modular_quad_pid/.build_bsp.tcl

quad/sw/modular_quad_pid/.create_bsp.tcl

quad/sw/modular_quad_pid/build.sh

quad/sw/modular_quad_pid/src/control_algorithm.c