First result after merge
changed size_t to int for compatibility between machines over ach
header update
Merge branch 'devel/merging-hubomzs' into devel/landingController
took out atomic traj enum stuff