Assignment3 Wes , Marsha

Hey christina, github was giving me an issue saying "entirely different commit histories", and wasn't letting me create a pull request! Fixed now :)