Merge branch '6-repeated-event' of https://agile.bu.edu/gitlab/ec327_projects/group3project

 Conflicts:
	.idea/gradle.xml
	.idea/misc.xml
	app/build.gradle
	app/src/main/AndroidManifest.xml
	app/src/main/res/layout/activity_main.xml
	app/src/main/res/values-night/themes.xml
	app/src/main/res/values/strings.xml
	app/src/main/res/values/themes.xml
	gradle/wrapper/gradle-wrapper.properties
	settings.gradle