Testing a merge conflict/PP3 Exercise 2 Emma Besier is taking CS107, AM207, AM205. A place to play with git. Fall 2021