changes to master list
Merge branch 'master' of https://github.com/adiagarwalla/cos333

merge