Removing dependence on trajectory_tracker
Merge branch 'master' of github.com:justinthomas/ground_effect

Conflicts:
	config/controllers.yaml
	src/state_control.cpp
	traj.csv