2nd attempt at rebase
my attempt at rebase, and I had to do some resolving conflicts along the way.
attempting to rebase
another comment for future rebase
a commit for TestBranch1 so github repo is in a state where I can mess with it again