Merge branch 'v1.0_initial_setup_all_screens' of...

Merge branch 'v1.0_initial_setup_all_screens' of https://agile.bu.edu/gitlab/ec327_projects/group3project

 Conflicts:
	.gradle/7.5/executionHistory/executionHistory.lock
	.gradle/7.5/fileHashes/fileHashes.bin
	.gradle/7.5/fileHashes/fileHashes.lock
	.gradle/buildOutputCleanup/buildOutputCleanup.lock
	.idea/workspace.xml