Merge branch 'updates'

diff --git a/json/maintainers.json b/json/maintainers.json
index d09998f..d3929c8 100644
--- a/json/maintainers.json
+++ b/json/maintainers.json
@@ -1,26 +1,42 @@
-{
-  "ID": [
-    ""
-  ],
-  "Avatar": [
-    ""
-  ],
-  "Name": [
-    ""
-  ],
-  "XDAUsername": [
-    ""
-  ],
-  "HangoutsUsername": [
-    ""
-  ],
-  "Email": [
-    ""
-  ],
-  "TelegramUsername": [
-    ""
-  ],
-  "Github_Username": [
-    ""
-  ]
-}
+[
+   {
+       "name": "tioburla",
+       "email": "tioburla@blissroms.com",
+       "device": [
+           "santoni"
+       ]
+   },
+   {
+       "name": "Eric Park (ideaman924)",
+       "email": "ideaman924@blissroms.com",
+       "device": [
+           "bullhead"
+       ]
+   },
+   {
+       "name": "Jon West (electrikjesus)",
+       "email": "electrikjesus@blissroms.com",
+       "device": [
+           "GSI",
+           "x86/x86_64",
+           "EFI"
+       ]
+   },
+   {
+       "name": "Wes Goodrich (bcrichster)",
+       "email": "bcrichster@blissroms.com",
+       "device": [
+           "payton",
+           "owens",
+           "warp4"
+       ]
+   },
+   {
+        "name": "Beau Echols (REV3NT3CH)",
+        "email": "rev3nt3ch@blissroms.com",
+        "device": [
+            "dumpling",
+            "cheeseburger"
+        ]
+    }
+]
diff --git a/json/maintainers.py b/json/maintainers.py
new file mode 100644
index 0000000..4d40ff0
--- /dev/null
+++ b/json/maintainers.py
@@ -0,0 +1,20 @@
+import json
+
+user_list = []
+
+user = {}
+
+user["name"] = input("Name: ")
+user["email"] = input("Email: ")
+user["device"] = []
+
+while True:
+	device_name = input("Device codename (type -1 to end): ")
+	if device_name == "-1":
+		break
+	user["device"].append(device_name)
+
+user_list.append(user)
+
+print("Finished! Please give the following output to Eric:")
+print(json.dumps(user_list, indent=4))
\ No newline at end of file