trying again

tried to rebase... that didn't work out. but did everything else you said to. made a new branch, deleted the file, commited. then went back to the old branch, rolled back, and then merged in the new branch