Merge branch 'main' into import-exportimport-export

# Conflicts:
#	data/personaldb.json
#	src/main/java/design/controller/userinput/menus/MainMenu.java
#	src/main/java/design/persistence/JSONLeagueDatabase.java
#	src/main/java/design/persistence/JSONPersonalDatabase.java
#	src/test/java/design/model/ClubTest.java
#	src/test/java/design/model/GolferTest.java

2 files changed, 15 insertions, 22 deletions

diff --git a/data/leaguedb.json b/data/leaguedb.json
new file mode 100644
index 0000000..1c3cef0
--- /dev/null
+++ b/data/leaguedb.json
@@ -0,0 +1,13 @@
+[
+  {
+    "type": "scramble",
+    "id": 1,
+    "name": "l",
+    "registrationDate": 946702800000,
+    "startDate": 946702800000,
+    "endDate": 946702800000,
+    "owner": "sowgro",
+    "participants": [],
+    "schedule": []
+  }
+]
\ No newline at end of file
diff --git a/data/personaldb.json b/data/personaldb.json
index 4e42e0d..9b9709d 100644
--- a/data/personaldb.json
+++ b/data/personaldb.json
@@ -1,25 +1,5 @@
 [
   {
-    "clubs": [],
-    "nextClubId": 1,
-    "username": "test",
-    "passwordHash": 3556498,
-    "fullName": "test",
-    "courses": [],
-    "rounds": [],
-    "invites": []
-  },
-  {
-    "clubs": [],
-    "nextClubId": 1,
-    "username": "GUYHERE",
-    "passwordHash": 3556498,
-    "fullName": "GUYHERE",
-    "courses": [],
-    "rounds": [],
-    "invites": []
-  },
-  {
     "clubs": [
       {
         "id": 1,
@@ -151,8 +131,8 @@
     "clubs": [],
     "nextClubId": 1,
     "username": "sowgro",
-    "passwordHash": -896456343,
-    "fullName": "sowgro",
+    "passwordHash": 389416948,
+    "fullName": "tyler f",
     "courses": [],
     "rounds": [],
     "invites": []