Merge branch 'master' into groundStation-dev-setpointcontrollers

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/sw/modular_quad_pid/src/control_algorithm.c

quad/sw/modular_quad_pid/src/iic_mpu9150_utils.c

quad/sw/modular_quad_pid/src/initialize_components.c

quad/sw/modular_quad_pid/src/log_data.c

website/content/files/DesignDocument2.pdf

website/content/files/ProjectPlanVersion2.pdf

website/content/files/ProjectPlanVersion3.pdf

website/content/pages/documents.md