Consolidate contents of `programming.json` into `computer-basics.json`
fixed rebase merge errors Fix videos route Fix hikes broken true/false fixed component name