Task 3

README.md

@@ -76,8 +76,8 @@ started working on the recipe in `recipe.md` together, and then each filled in t
 what they felt would make the most delicious cake!
 You'll notice that your repository already has two branches called `alice` and `bob`.
 
-- [ ] Checkout the `alice` branch.
-- [ ] Attempt to merge the `bob` branch into the `alice` branch using either IntelliJ or the Terminal.
+- [x] Checkout the `alice` branch.
+- [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.

recipe.md

@@ -4,9 +4,27 @@
 - 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
+
 
 ## Instructions:
 1. Preheat the oven to 350°F (175°C).
-2. In a large bowl, whisk together the flour, sugar, and cocoa powder.
-3. ...
+2. In a large bowl, whisk together the flour, sugar, cocoa powder, chocolate chips, and vanilla extract.
+3. ...
+
+## Additional Directions by Alice:
+4. In a separate bowl, beat the eggs and add them to the mixture. Stir until well combined.
+5. Gradually add the milk and vegetable oil to the mixture, continuing to stir.
+6. Pour the batter into a greased and floured 9x13-inch baking pan.
+
+
+## Instructions:
+1. Preheat the oven to 375°F (190°C).
+2. In a large bowl, whisk together the flour, sugar, cocoa powder, and ground cinnamon.
+3. ...
+
+## Additional Directions by Bob:
+4. Add a tablespoon of instant coffee to the dry ingredients for a hint of mocha flavor.
+5. Mix in a handful of chocolate chunks for extra indulgence.
+6. Line the bottom of the baking pan with parchment paper for easy cake removal.