Merge Back In

We don't actually need both favs and favs2, so:

1. Switch back to main.
2. Try deleting the favs2 branch with the lowercase -d flag.
3. Now actually delete favs2 with the capitalized -D flag.
4. Merge favs into main. This should result in a fast-forward merge.
5. Delete the favs branch, we don't need it anymore.

Run and submit the CLI tests.