started commenting, finished kbd_controller and pibot_controller
fixed merge conflicts