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

merge
Merge branch 'master' of https://github.com/adiagarwalla/cos333

merge
testing
testing2
code for abhi to look at