somewhat working robot model and robot simulation app
fixing merge stuff