clean up old branches

[mbjones]

Old branches for develop and master were accidentally merged with prior changes from branch 2.3, which resulted in duplicates of many commits and that don't add new code. Create a new branch to track these changes, but revert develop and master to their original locations, and then update develop on top of main` for continued release work.

[mbjones]

Created new branches to archive the develop branch that held prior changes that were targeting a release but that went obsolete before being released. I archived both the develop branch and master branch for posterity, using:

• task-4-archive-develop branch: contains develop from sha f4745cf
• task-4-archive-master branch: contains master from sha 8514916

After these changes were made, the master branch was deleted to eliminate confusion with main which is now the default branch, and the develop branch was reset to main at sha 9fd4807 to begin new release development.

Because the develop branch was force pushed to rewrite history, any devs with existing copies of the repo will need to reset their develop branch to the new pointer. This can be done with:

• git fetch origin +develop:develop to reset the local branch to match the remote pointer (then need to follow this up with a git checkout develop and git pull on the develop branch to sync your working copy. If you had made local changes, you should stash those in another branch before running all of this. cc @taojing2002