Merge branch 'dev' of https://github.com/frenchie16/wpi-suite-team6.git into dev
Merge branch 'dev' into feat/visualize-new-events
merged in dev