diff --git a/.idea/.gitignore b/.idea/.gitignore
new file mode 100644
index 0000000..13566b8
--- /dev/null
+++ b/.idea/.gitignore
@@ -0,0 +1,8 @@
+# Default ignored files
+/shelf/
+/workspace.xml
+# Editor-based HTTP Client requests
+/httpRequests/
+# Datasource local storage ignored files
+/dataSources/
+/dataSources.local.xml
diff --git a/.idea/Git-A3.iml b/.idea/Git-A3.iml
new file mode 100644
index 0000000..d6ebd48
--- /dev/null
+++ b/.idea/Git-A3.iml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$" />
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
new file mode 100644
index 0000000..6f29fee
--- /dev/null
+++ b/.idea/misc.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_21" default="true" project-jdk-name="21" project-jdk-type="JavaSDK">
+    <output url="file://$PROJECT_DIR$/out" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
new file mode 100644
index 0000000..ce2b994
--- /dev/null
+++ b/.idea/modules.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/Git-A3.iml" filepath="$PROJECT_DIR$/.idea/Git-A3.iml" />
+    </modules>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
new file mode 100644
index 0000000..35eb1dd
--- /dev/null
+++ b/.idea/vcs.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="" vcs="Git" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/05-grade.sh b/05-grade.sh
index c148449..5d96938 100644
--- a/05-grade.sh
+++ b/05-grade.sh
@@ -19,3 +19,32 @@ fi
 # that prints "it's cold" if the temperature is < 40
 # it's chilly if < 60, it's okay if < 70 and, it's hot for 
 # everything else
+
+temp=$(weather Lawrenceville | grep -i "Temperature" | grep -oE '[0-9]+')
+
+echo "Current temperature: ${temp}°F"
+
+# Check if temp was successfully retrieved
+if [ -z "$temp" ]; then
+    echo "Could not read temperature."
+else
+    if [ "$temp" -lt 40 ]; then
+        echo "It's cold."
+    elif [ "$temp" -lt 60 ]; then
+        echo "It's chilly."
+    elif [ "$temp" -lt 70 ]; then
+        echo "It's okay."
+    else
+        echo "It's hot."
+    fi
+echo "Current temperature: $temp°F"
+
+if [ -z $temp -lt 40 ]; then
+    echo "It's cold."
+elif [ $temp -lt 60 ]; then
+    echo "It's chilly."
+elif [ $temp -lt 70 ]; then
+    echo "It's okay."
+else
+    echo "It's hot."
+fi
\ No newline at end of file
diff --git a/MergeIntoMain.png b/MergeIntoMain.png
new file mode 100644
index 0000000..c4c1566
Binary files /dev/null and b/MergeIntoMain.png differ
diff --git a/Two branches.png b/Two branches.png
new file mode 100644
index 0000000..1d9c9e1
Binary files /dev/null and b/Two branches.png differ