removed d3/ oops
Instructed forward merge
Merge branch 'play' of https://github.com/alexandraorth/GetWithTheTimes into play