adding in work from chapter 2
removing a few files from tracking