Merge branch 'shawns' into 'main'

App/event36/.gitignore

App/event36/.idea/compiler.xml

App/event36/.idea/misc.xml

.../app/src/main/java/com/example/event36/CustomAdapter.java

App/event36/app/src/main/java/com/example/event36/Event.java

...c/main/java/com/example/event36/EventRestoSuperClass.java

...6/app/src/main/java/com/example/event36/MainActivity.java

App/event36/app/src/main/java/com/example/event36/User.java

App/event36/app/src/main/res/drawable/no_image.png

App/event36/app/src/main/res/layout/activity_main.xml

App/event36/app/src/main/res/layout/list_item.xml

App/event36/app/src/main/res/layout/recycler_view.xml

App/event36/app/src/main/res/values/strings.xml

App/event36/build.gradle

App/event36/gradle/wrapper/gradle-wrapper.jar

App/event36/gradle/wrapper/gradle-wrapper.properties

App/event36/gradlew