From b43a78cd60f08e44f59765e11d968611f1543a4a Mon Sep 17 00:00:00 2001
From: Hongrui Shi <hongrui.shi.20@ucl.ac.uk>
Date: Thu, 29 Oct 2020 11:04:04 +0000
Subject: [PATCH 1/2] add information

---
 friend-group-2020 | 1 +
 group.py          | 9 ++++++++-
 2 files changed, 9 insertions(+), 1 deletion(-)
 create mode 160000 friend-group-2020

diff --git a/friend-group-2020 b/friend-group-2020
new file mode 160000
index 0000000..5b1d3ce
--- /dev/null
+++ b/friend-group-2020
@@ -0,0 +1 @@
+Subproject commit 5b1d3cec33ab78f023ee86d93e23e19a319bbb1f
diff --git a/group.py b/group.py
index e2ec347..c3cb7f1 100644
--- a/group.py
+++ b/group.py
@@ -2,4 +2,11 @@
 
 # Your code to go here...
 
-my_group =
+
+my_group = { "Jill" : {"age" : 26, "job" : "biologist", "connection" : ["Zalika", "John"]}, 
+
+            "Zaklika" : {"age" : 28, "job" : "artist", "connection" : ["Jill"]},
+
+            "John" : {"age" : 27, "job" : "writer", "connection" : ["Jill"]},
+
+           "Nash" : {"age" : 34, "job" : "chef", "connection" : ["Zalika", "John"]}}
\ No newline at end of file

From 788ed97bb98ceb9488693a877f73c3f27e068732 Mon Sep 17 00:00:00 2001
From: Hongrui Shi <hongrui.shi.20@ucl.ac.uk>
Date: Sat, 7 Nov 2020 17:26:07 +0000
Subject: [PATCH 2/2] add json

---
 group.json | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 group.json

diff --git a/group.json b/group.json
new file mode 100644
index 0000000..64d5775
--- /dev/null
+++ b/group.json
@@ -0,0 +1 @@
+{"Jill": {"age": 26, "job": "biologist", "relations": {"Zalika": "friend", "John": "partner"}}, "Zalika": {"age": 28, "job": "artist", "relations": {"Jill": "friend"}}, "John": {"age": 27, "job": "writer", "relations": {"Jill": "partner"}}, "Nash": {"age": 34, "job": "chef", "relations": {"John": "cousin", "Zalika": "landlord"}}}
\ No newline at end of file