Merge branch 'master' of agile.bu.edu:ec504/ec504_projects/group4