Reset .zip file?
:(
Merge branch 'master' of https://github.com/diogoalmeida/thesis

Conflicts:
	MATLAB/Quad_Model/Thrust_Controller/attitude_controller.m
	MATLAB/Quad_Model/Thrust_Controller/attitude_controller_run.m
	MATLAB/Quad_Model/Thrust_Controller/quadcopter.m
	Problem_Statement/problem_statement.tex
	Problem_Statement/thesis_bib.bib