report 2 finalization
Merge branch 'master' of git://github.com/dlisuk/cse221_project