diff --git a/.gitignore b/.gitignore
index f68d1099..86cf6485 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,6 +22,8 @@ bin/
/nbdist/
/.nb-gradle/
+.idea
+
### VS Code ###
.vscode/
diff --git a/.idea/.gitignore b/.idea/.gitignore
new file mode 100644
index 00000000..13566b81
--- /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/checkstyle-idea.xml b/.idea/checkstyle-idea.xml
new file mode 100644
index 00000000..bf19c12d
--- /dev/null
+++ b/.idea/checkstyle-idea.xml
@@ -0,0 +1,13 @@
+
+
+
+ 11.0.0
+ JavaOnly
+
+
+
\ No newline at end of file
diff --git a/.idea/copilot.data.migration.agent.xml b/.idea/copilot.data.migration.agent.xml
new file mode 100644
index 00000000..4ea72a91
--- /dev/null
+++ b/.idea/copilot.data.migration.agent.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/copilot.data.migration.edit.xml b/.idea/copilot.data.migration.edit.xml
new file mode 100644
index 00000000..8648f940
--- /dev/null
+++ b/.idea/copilot.data.migration.edit.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
new file mode 100644
index 00000000..7d7eb4bf
--- /dev/null
+++ b/.idea/inspectionProfiles/Project_Default.xml
@@ -0,0 +1,253 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
new file mode 100644
index 00000000..64232f0f
--- /dev/null
+++ b/.idea/misc.xml
@@ -0,0 +1,7 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
new file mode 100644
index 00000000..52b1a732
--- /dev/null
+++ b/.idea/modules.xml
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
new file mode 100644
index 00000000..35eb1ddf
--- /dev/null
+++ b/.idea/vcs.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/README.md b/README.md
index 49ad8cf6..bcade70d 100644
--- a/README.md
+++ b/README.md
@@ -25,14 +25,14 @@ Your TA will share a different URL for you to fork from, so that you
can make pull requests to that repo during Task 3 of the lab.
If you miss the lab and work on this after, you can use this URL though.
-- [ ] Make a fork of this repo and clone a local copy (as you did in Lab 1).
+- [x] Make a fork of this repo and clone a local copy (as you did in Lab 1).
>**Important**: make sure to uncheck the option to only fork the main branch, as the repo
> contains two branches you will use later in this lab.
# TASK 1: Your first branch
-- [ ] Create and checkout a new branch called `task_1` using either IntelliJ or the Terminal:
+- [x] Create and checkout a new branch called `task_1` using either IntelliJ or the Terminal:
- IntelliJ: `Git -> New branch...`
- Terminal: `git checkout -b task_1`
- After, you can check `git status` or the Log tab of the Git tool window in IntelliJ to see
@@ -40,17 +40,17 @@ If you miss the lab and work on this after, you can use this URL though.
---
-- [ ] Open the TODO tool window (`View -> Tool Windows -> TODO`) and click on the TASK 1 TODO listed.
+- [x] Open the TODO tool window (`View -> Tool Windows -> TODO`) and click on the TASK 1 TODO listed.
---
-- [ ] Complete the TASK 1 TODO and commit your changes to this file (checking off the
+- [x] Complete the TASK 1 TODO and commit your changes to this file (checking off the
completed items so far) and `DataTypes.java` (remove the word TODO and your bug fix).
- talk to your team or your TA, then see the hints at the bottom of the readme if you get stuck.
---
-- [ ] Now, we'll merge the `task_1` branch back into `main`. When merging,
+- [x] Now, we'll merge the `task_1` branch back into `main`. When merging,
you need to be currently on the branch you are trying to merge into, so we'll first check out the main
branch:
- IntelliJ: `Git -> branches... -> main -> Checkout`
@@ -59,7 +59,7 @@ branch:
---
-- [ ] We are back on `main`, so we can now do the merge and complete our work!
+- [x] We are back on `main`, so we can now do the merge and complete our work!
- IntelliJ: `Git -> Merge... -> task_1 -> Merge`
- Terminal: `git merge task_1`
@@ -67,13 +67,13 @@ You should now see the changes that you made are now in the `main` branch.
---
-- [ ] Now, we'll want to clean up since we are done with our `task_1` branch.
+- [x] Now, we'll want to clean up since we are done with our `task_1` branch.
- IntelliJ: `Git -> branches... -> task_1 -> Delete`
- Terminal: `git branch -d task_1`
---
-- [ ] Last step! We'll push our changes to the remote repository to share our work! (As we did in Lab 1.)
+- [x] Last step! We'll push our changes to the remote repository to share our work! (As we did in Lab 1.)
- we suggest you check off this last item, commit that change, and then push your code.
Check GitHub to ensure you can see your changes.
@@ -97,31 +97,31 @@ on their own branch.
You'll notice that your repository already has two branches called `alice` and `bob`.
-- [ ] Checkout the `alice` branch.
+- [x] Checkout the `alice` branch.
-- [ ] Attempt to merge the `bob` branch into the `alice` branch using either IntelliJ or the Terminal.
+- [x] Attempt to merge the `bob` branch into the `alice` branch using either IntelliJ or the Terminal.
- You will be prompted to resolve a merge conflict. To do this, you will need to pick and choose which
parts of each recipe to keep.
- - Read what either `git` or `IntelliJ` tells you in order to complete the merge process.
+ - Read what either `git` or `IntelliJ` tells you in order to complete ge process.
- If you do the merge through the Terminal, you will need to edit `recipe.md` to remove all of the
merge conflict symbols which `git` has added to your file. Once done, you will need to `git add` the
`recipe.md` file and `git commit` to finish the merge.
-- [ ] Once the merge is complete, delete the `bob` branch.
+- [x] Once the merge is complete, delete the `bob` branch.
-- [ ] Finally, checkout the `main` branch and merge the `alice` branch in (as we did previously).
+- [x] Finally, checkout the `main` branch and merge the `alice` branch in (as we did previously).
Now, you are almost ready to share your recipe with the remote!
# TASK 3
-- [ ] Checkout a new branch called `task_3`.
+- [x] Checkout a new branch called `task_3`.
-- [ ] Commit any changes that you want to `recipe.md` to further improve the recipe.
+- [x] Commit any changes that you want to `recipe.md` to further improve the recipe.
-- [ ] **While still on the `task_3` branch**, push your code to your remote repository on GitHub.
+- [x] **While still on the `task_3` branch**, push your code to your remote repository on GitHub.
-- [ ] Go to GitHub and you will see an option to make a pull request to the original repo. Make
+- [x] Go to GitHub and you will see an option to make a pull request to the original repo. Make
a pull request and see that the PR shows up in the original repository that you forked.
Since others will also be making pull requests, we won't *actually* accept any of them for now, but
diff --git a/lab2-branching-and-merging.iml b/lab2-branching-and-merging.iml
new file mode 100644
index 00000000..4888ed0b
--- /dev/null
+++ b/lab2-branching-and-merging.iml
@@ -0,0 +1,41 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/recipe.md b/recipe.md
index a8b51a4d..3f21da14 100644
--- a/recipe.md
+++ b/recipe.md
@@ -4,9 +4,20 @@
- 2 cups all-purpose flour
- 1 3/4 cups granulated sugar
- 3/4 cup unsweetened cocoa powder
-- ...
+- 1 cup chocolate chips
+- 1 tsp vanilla extract
+- 1/2 tsp ground cinnamon
+
## Instructions:
1. Preheat the oven to 350°F (175°C).
-2. In a large bowl, whisk together the flour, sugar, and cocoa powder.
-3. ...
\ No newline at end of file
+2. In a large bowl, whisk together the flour, sugar, cocoa powder, chocolate chips, and vanilla extract.
+
+## Additional Directions:
+3. In a separate bowl, beat the eggs and add them to the mixture. Stir until well combined.
+4. Gradually add the milk and vegetable oil to the mixture, continuing to stir.
+5. Add a tablespoon of instant coffee to the dry ingredients for a hint of mocha flavour.
+6. Mix in a handful of chocolate chunks for extra indulgence.
+7. Line the bottom of the baking pan with parchment paper for easy cake removal.
+8. Pour the batter into a greased and floured 9x13-inch baking pan.
+9. Sprinkle sea salt flakes on top of the batter.
\ No newline at end of file
diff --git a/src/DataTypes.java b/src/DataTypes.java
index 12c0618e..1c1adc7f 100644
--- a/src/DataTypes.java
+++ b/src/DataTypes.java
@@ -1,7 +1,6 @@
public class DataTypes {
- // TODO TASK 1: fix this code so that it passes the test in DataTypesTest.java
public static long sum(int[] numbers) {
- int s = 0; // variable to accumulate the sum in!
+ long s = 0; // variable to accumulate the sum in!
// below is a "foreach" loop which iterates through numbers
for (int x : numbers) {
s += x;