edited stuff
Merge branch 'master' of github.com:emilyliao97/pd1-BS-Chen-Liao