resolved merge conflict with Ed's
Merge branch 'master' of https://github.com/eswalker/cos333

merge with Ed
added data; fixed 'status' attribute
merged with ed; fixed up status