521b1cb2f7
# Conflicts: # client/app/src/main/java/main/CreateEventController.java
# Conflicts: # client/app/src/main/java/main/CreateEventController.java