Merge branch 'master' of https://agile.bu.edu/gitlab/ec504/ec504_projects/group8