Resolve conflicts

Assets/SpellingBee/Scripts/ThemeLoader.cs

@@ -0,0 +1,26 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+// JSON structure containing all themes/words
+[System.Serializable]
+public class ThemeList {
+    public Theme[] themes;
+}
+
+// Object representing part of the JSON containing word data
+[System.Serializable]
+public class Theme {
+    public string name;
+    public string description;
+    public string[] words;
+}
+
+public class ThemeLoader : MonoBehaviour
+{
+    // Loads the JSON file containing all of the themes
+    public static ThemeList loadJson() {
+        TextAsset themeJson = Resources.Load<TextAsset>("SpellingBee/words");
+        return JsonUtility.FromJson<ThemeList>(themeJson.text);
+    }
+}