Work on planner
Merge branch 'master' of https://github.com/MareinK/robotica2