From 66f5db3158fe8c9695cc8855160cf796ffbb996e Mon Sep 17 00:00:00 2001
From: Russell Ferri <rferri@gr8people.com>
Date: Mon, 8 Feb 2016 11:55:44 -0500
Subject: [PATCH 01/26] Fix clone your fork section

---
 walkthrough/1-setup.md | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/walkthrough/1-setup.md b/walkthrough/1-setup.md
index 570d5026..ac9e62a2 100644
--- a/walkthrough/1-setup.md
+++ b/walkthrough/1-setup.md
@@ -15,15 +15,18 @@ Fork the source repository:
    1. Visit https://github.com/source-username/repository-name.
    2. Click the "fork" button, and choose your personal GitHub account if prompted.
 
+---
+
+:cop: :raised_hand: - Please wait until everyone has caught up.
+
+:construction: :construction: :construction: :construction: :construction: :construction: :construction: :construction: :construction: :construction: :construction: :construction: :construction: :construction: :construction:
+
+---
 
 ### 2 - Clone your Fork
 
 __All Team Members__
 
-Fork the source repository:
-   1. Visit https://github.com/source-username/repository-name.
-   2. Click the "fork" button, and choose your personal GitHub account if prompted.
-
 Clone your fork to your local machine:
 ```sh
 $ cd ~/my/parent/directory

From 7c17ea1b6ceae6ebb1acbb6f8b3220802761ce01 Mon Sep 17 00:00:00 2001
From: Russell Ferri <rferri@gr8people.com>
Date: Mon, 8 Feb 2016 12:00:54 -0500
Subject: [PATCH 02/26] change username refs to your-username

---
 walkthrough/1-setup.md       | 14 +++++++-------
 walkthrough/3-code-review.md |  4 ++--
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/walkthrough/1-setup.md b/walkthrough/1-setup.md
index ac9e62a2..746bf75d 100644
--- a/walkthrough/1-setup.md
+++ b/walkthrough/1-setup.md
@@ -30,7 +30,7 @@ __All Team Members__
 Clone your fork to your local machine:
 ```sh
 $ cd ~/my/parent/directory
-$ git clone https://github.com/username/repository-name.git
+$ git clone https://github.com/your-username/repository-name.git
 # clone the fork repository from GitHub
 
 $ cd repository-name
@@ -43,16 +43,16 @@ $ git remote
 origin
 
 $ git remote -v
-origin https://github.com/username/repository-name.git (fetch)
-origin https://github.com/username/repository-name.git (push)
+origin https://github.com/your-username/repository-name.git (fetch)
+origin https://github.com/your-username/repository-name.git (push)
 ```
 
 You should see an `origin` remote that points to your GitHub fork:
 ```sh
 $ git remote show origin
 * remote origin
-  Fetch URL: https://github.com/username/repository-name.git
-  Push  URL: https://github.com/username/repository-name.git
+  Fetch URL: https://github.com/your-username/repository-name.git
+  Push  URL: https://github.com/your-username/repository-name.git
   HEAD branch: master
   Remote branches:
     develop tracked
@@ -101,8 +101,8 @@ $ git remote add source https://github.com/source-username/repository-name.git
 # add the source remote
 
 $ git remote -v
-origin https://github.com/username/repository-name.git (fetch)
-origin https://github.com/username/repository-name.git (push)
+origin https://github.com/your-username/repository-name.git (fetch)
+origin https://github.com/your-username/repository-name.git (push)
 source https://github.com/source-username/repository-name.git (fetch)
 source https://github.com/source-username/repository-name.git (push)
 ```
diff --git a/walkthrough/3-code-review.md b/walkthrough/3-code-review.md
index f9bdffb2..e6b30152 100644
--- a/walkthrough/3-code-review.md
+++ b/walkthrough/3-code-review.md
@@ -46,8 +46,8 @@ $ git remote add teammate https://github.com/teammmate-username/repository-name.
 # add the teammate remote
 
 $ git remote -v
-origin https://github.com/username/repository-name.git (fetch)
-origin https://github.com/username/repository-name.git (push)
+origin https://github.com/your-username/repository-name.git (fetch)
+origin https://github.com/your-username/repository-name.git (push)
 source https://github.com/source-username/repository-name.git (fetch)
 source https://github.com/source-username/repository-name.git (push)
 teammate https://github.com/teammate-username/repository-name.git (fetch)

From 70be2cb44eacff64442397bc4dac61dcf0a4b890 Mon Sep 17 00:00:00 2001
From: Russell Ferri <rferri@gr8people.com>
Date: Mon, 8 Feb 2016 12:07:01 -0500
Subject: [PATCH 03/26] prefx commands with $

---
 walkthrough/1-setup.md | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/walkthrough/1-setup.md b/walkthrough/1-setup.md
index 746bf75d..6e58bf2f 100644
--- a/walkthrough/1-setup.md
+++ b/walkthrough/1-setup.md
@@ -167,19 +167,19 @@ __All Team Members__
 
 By now you should have noticed that you do not have a local `develop` branch
 ```sh
-git branch
+$ git branch
 * master
 ```
 
 Create a `develop` branch that tracks from your GitHub fork's `develop` branch:
 ```sh
-git branch develop origin/develop
+$ git branch develop origin/develop
 Branch develop set up to track remote branch develop from origin
 ```
 
 Notice that viewing the details for the `origin` remote indicates that the local `develop` and `master` branches are configured to push to and pull from your GitHub fork's branches:
 ```sh
-git remote show origin
+$ git remote show origin
 ...
    Local branches configured for 'git pull':
      develop merges with remote develop
@@ -191,7 +191,7 @@ git remote show origin
 
 :bulb: The `-vv` flag for the `git branch` command will also show the remote branches that are tracked by your local branches (in brackets):
 ```sh
-git branch --vv
+$ git branch --vv
   develop 3e03a92 [origin/develop] Create example app
 * master  3e03a92 [origin/master] Create example app
 ```

From ed3c66ba490ca9ded475f220d8079fae1868235d Mon Sep 17 00:00:00 2001
From: Russell Ferri <rferri@gr8people.com>
Date: Mon, 8 Feb 2016 12:08:51 -0500
Subject: [PATCH 04/26] fix --vv

---
 walkthrough/1-setup.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/walkthrough/1-setup.md b/walkthrough/1-setup.md
index 6e58bf2f..cbb6daf8 100644
--- a/walkthrough/1-setup.md
+++ b/walkthrough/1-setup.md
@@ -191,7 +191,7 @@ $ git remote show origin
 
 :bulb: The `-vv` flag for the `git branch` command will also show the remote branches that are tracked by your local branches (in brackets):
 ```sh
-$ git branch --vv
+$ git branch -vv
   develop 3e03a92 [origin/develop] Create example app
 * master  3e03a92 [origin/master] Create example app
 ```

From 07aca4f258c4be14e01b4403832a2ca16c2110e9 Mon Sep 17 00:00:00 2001
From: Russell Ferri <rferri@gr8people.com>
Date: Mon, 8 Feb 2016 12:31:23 -0500
Subject: [PATCH 05/26] Move 'you are ready' paragraph before wait message

---
 walkthrough/1-setup.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/walkthrough/1-setup.md b/walkthrough/1-setup.md
index cbb6daf8..8c0e166a 100644
--- a/walkthrough/1-setup.md
+++ b/walkthrough/1-setup.md
@@ -196,6 +196,8 @@ $ git branch -vv
 * master  3e03a92 [origin/master] Create example app
 ```
 
+You should now be ready to move on to the rest of the walkthrough. If you'd like to see the repository you've created on your local machine in GitHub desktop, you can add a repository by choosing a local path.
+
 ---
 
 :cop: :raised_hand: - Please wait until everyone has caught up.
@@ -204,8 +206,6 @@ $ git branch -vv
 
 ---
 
-You should now be ready to move on to the rest of the walkthrough. If you'd like to see the repository you've created on your local machine in GitHub desktop, you can add a repository by choosing a local path.
-
 ## Next
 
 Next we will walk through the process of creating feature branches, publishing changes to GitHub, and making a request to merge changes into the source repository using a Pull Request.

From 5bd3e58667c1564438a4265d2f596cb7a333e116 Mon Sep 17 00:00:00 2001
From: Russell Ferri <rferri@gr8people.com>
Date: Mon, 8 Feb 2016 12:39:31 -0500
Subject: [PATCH 06/26] adding info message about feature branch names

---
 walkthrough/2-feature-branches.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/walkthrough/2-feature-branches.md b/walkthrough/2-feature-branches.md
index e27e7fad..f6054aab 100644
--- a/walkthrough/2-feature-branches.md
+++ b/walkthrough/2-feature-branches.md
@@ -35,6 +35,8 @@ $ git branch
 * master
 ```
 
+:bulb: Feature branches will be named such that someone else can look at what branches are in progress and get a rough idea of what work is being done on each branch.
+
 Next, switch to the newly created feature branch:
 ```sh
 $ git checkout cuba-pudding-jr-feb

From 9cd5b8ca260f3be30c553ae4a50aa60ad64b7388 Mon Sep 17 00:00:00 2001
From: Russell Ferri <rferri@gr8people.com>
Date: Mon, 8 Feb 2016 12:41:48 -0500
Subject: [PATCH 07/26] remove extra _

---
 walkthrough/2-feature-branches.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/walkthrough/2-feature-branches.md b/walkthrough/2-feature-branches.md
index f6054aab..818e066a 100644
--- a/walkthrough/2-feature-branches.md
+++ b/walkthrough/2-feature-branches.md
@@ -64,7 +64,7 @@ Switched to a new branch 'cuba-pudding-jr-feb'
 
 ### 2 - Make Changes to the Project
 
-__All Team Members___
+__All Team Members__
 
 In your text editor, make the following changes:
 1. Add the new recipe under the [`/app/recipe/feb/`](/app/recipe/feb/) directory.

From 02318ab2043d427b1224f1a76537c50c2491baaa Mon Sep 17 00:00:00 2001
From: Russell Ferri <rferri@gr8people.com>
Date: Mon, 8 Feb 2016 12:42:34 -0500
Subject: [PATCH 08/26] remove extra _

---
 walkthrough/2-feature-branches.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/walkthrough/2-feature-branches.md b/walkthrough/2-feature-branches.md
index 818e066a..e81688a4 100644
--- a/walkthrough/2-feature-branches.md
+++ b/walkthrough/2-feature-branches.md
@@ -83,7 +83,7 @@ Since other people are going to be making changes at the same time, be careful n
 
 ### 3 - Diff Changes
 
-__All Team Members___
+__All Team Members__
 
 If you view the current git status, you will see 2 files with unstaged changes and a new folder that has not been tracked by git:
 ```sh

From 4b74c8118803f7972ab7b5b28eec7d57ea9a2e67 Mon Sep 17 00:00:00 2001
From: Russell Ferri <rferri@gr8people.com>
Date: Mon, 8 Feb 2016 12:43:55 -0500
Subject: [PATCH 09/26] fix markdown list formatting

---
 walkthrough/2-feature-branches.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/walkthrough/2-feature-branches.md b/walkthrough/2-feature-branches.md
index e81688a4..e18a28cf 100644
--- a/walkthrough/2-feature-branches.md
+++ b/walkthrough/2-feature-branches.md
@@ -67,6 +67,7 @@ Switched to a new branch 'cuba-pudding-jr-feb'
 __All Team Members__
 
 In your text editor, make the following changes:
+
 1. Add the new recipe under the [`/app/recipe/feb/`](/app/recipe/feb/) directory.
 2. Update the writer's page in the [`/app/writer/`](/app/writer/) direcotry.
 3. Update the main mage [`/app/index.md`](/app/index.md).

From 6e817ee4eeb1830c5b0188765fe1be9aca4ee4f6 Mon Sep 17 00:00:00 2001
From: Russell Ferri <rferri@gr8people.com>
Date: Mon, 8 Feb 2016 12:45:55 -0500
Subject: [PATCH 10/26] fix typo

---
 walkthrough/2-feature-branches.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/walkthrough/2-feature-branches.md b/walkthrough/2-feature-branches.md
index e18a28cf..d09e7b0b 100644
--- a/walkthrough/2-feature-branches.md
+++ b/walkthrough/2-feature-branches.md
@@ -69,7 +69,7 @@ __All Team Members__
 In your text editor, make the following changes:
 
 1. Add the new recipe under the [`/app/recipe/feb/`](/app/recipe/feb/) directory.
-2. Update the writer's page in the [`/app/writer/`](/app/writer/) direcotry.
+2. Update the writer's page in the [`/app/writer/`](/app/writer/) directory.
 3. Update the main mage [`/app/index.md`](/app/index.md).
 
 Since other people are going to be making changes at the same time, be careful not to make changes to lines of code that are not relevant to your change.

From 89aa88210c586df7bc0edb1b5c632fc74178ae17 Mon Sep 17 00:00:00 2001
From: Russell Ferri <rferri@gr8people.com>
Date: Mon, 8 Feb 2016 12:54:14 -0500
Subject: [PATCH 11/26] cleaning up feature branches walkthrough

---
 walkthrough/2-feature-branches.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/walkthrough/2-feature-branches.md b/walkthrough/2-feature-branches.md
index d09e7b0b..857bc5cc 100644
--- a/walkthrough/2-feature-branches.md
+++ b/walkthrough/2-feature-branches.md
@@ -82,7 +82,7 @@ Since other people are going to be making changes at the same time, be careful n
 
 ---
 
-### 3 - Diff Changes
+### 3 - Review Changes
 
 __All Team Members__
 
@@ -117,7 +117,7 @@ index ac3abad..9777cd5 100644
  ### [Cuba Pudding Jr.](writer/cuba-pudding-jr.md) | cubapud@flavor.magazine
 
 -[Grilled Peach Salad](recipe/jan/grilled-peach-salad.md)
-+[Quick Oatmeal Pancakes](		recipe/feb/quick-oatmeal-pancakes.md)
++[Quick Oatmeal Pancakes](recipe/feb/quick-oatmeal-pancakes.md)
 
  ### [Eggs Benny](writer/eggs-benny.md) | englishmuffin@flavor.magazine
 

From 9c5d4caba4b938c2110f0ef27186c7bec939a98b Mon Sep 17 00:00:00 2001
From: Russell Ferri <rferri@gr8people.com>
Date: Mon, 8 Feb 2016 12:55:04 -0500
Subject: [PATCH 12/26] fix markdown list formatting

---
 walkthrough/3-code-review.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/walkthrough/3-code-review.md b/walkthrough/3-code-review.md
index e6b30152..87da21c0 100644
--- a/walkthrough/3-code-review.md
+++ b/walkthrough/3-code-review.md
@@ -17,6 +17,7 @@ __All Team Members__
 Navigate to the source repository on GitHub, click the "Pull Requests" tab, and click on the Pull Request opened by the team member sitting to your right.
 
 Review the following things:
+
 1. Verify that the user is requesting to merge their feature branch into the `develop` branch.
 2. Check to see if there is any important information on the Conversation tab.
 3. Check the Commits tab to get a high-level view of the individual changes that were made.

From 32389610b10ab435003dd1f143d2ba988a7f5ba8 Mon Sep 17 00:00:00 2001
From: Russell Ferri <rferri@gr8people.com>
Date: Mon, 8 Feb 2016 13:01:56 -0500
Subject: [PATCH 13/26] fix typo: teammmate

---
 walkthrough/3-code-review.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/walkthrough/3-code-review.md b/walkthrough/3-code-review.md
index 87da21c0..0202d9f1 100644
--- a/walkthrough/3-code-review.md
+++ b/walkthrough/3-code-review.md
@@ -43,7 +43,7 @@ If you are curious to run someone else's code locally, you will need to set up a
 
 Create a remote pointing to the person to your right's Fork:
 ```sh
-$ git remote add teammate https://github.com/teammmate-username/repository-name.git
+$ git remote add teammate https://github.com/teammate-username/repository-name.git
 # add the teammate remote
 
 $ git remote -v

From a752151a34eea48230a879d492e3eb42249453c8 Mon Sep 17 00:00:00 2001
From: Russell Ferri <rferri@gr8people.com>
Date: Mon, 8 Feb 2016 13:07:42 -0500
Subject: [PATCH 14/26] add instuction to run git log on teammate branch

---
 walkthrough/3-code-review.md | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/walkthrough/3-code-review.md b/walkthrough/3-code-review.md
index 0202d9f1..364c5419 100644
--- a/walkthrough/3-code-review.md
+++ b/walkthrough/3-code-review.md
@@ -76,6 +76,20 @@ Switched to a new branch 'teammate-feature-branch'
 
 Now you've switched the code in your directory to a branch containing all of the changes committed to your teammate's branch. If you have your project open in sublime or another text editor you will notice that the source files contain your teammate's changes.
 
+If you run the `git log` command you can see a log of the latest commits made to the current branch:
+```sh
+$ git log
+commit 6b7a7c2bc46753d0d394758b8fd04bcd3b4cf896
+Author: My Teammate <teammate@gr8people.com>
+Date:   Mon Feb 8 12:58:20 2016 -0500
+
+    Adding Eggs Benny February Recipe
+
+...
+```
+
+:bulb: Press enter to scroll through lines <kbd>&amp;</kbd> <kbd>Ctrl</kbd>+<kbd>C</kbd> to exit the log.
+
 Once you are done, you can delete this branch:
 ```sh
 $ git checkout develop

From 564c45c1248e99df8e241f8e195809a4b0cceda2 Mon Sep 17 00:00:00 2001
From: Russell Ferri <rferri@gr8people.com>
Date: Fri, 5 May 2017 09:26:12 -0400
Subject: [PATCH 15/26] Update walkthrough

---
 README.md                          |  2 +-
 walkthrough/1-setup.md             | 82 +++++++++++++-----------------
 walkthrough/2-feature-branches.md  | 23 +++++----
 walkthrough/3-code-review.md       | 14 +++--
 walkthrough/4-fetching-latest.md   | 22 ++------
 walkthrough/5-hotfix.md            | 15 +++---
 walkthrough/6-release-branch.md    | 14 +----
 walkthrough/7-release-bugs.md      | 10 ++--
 walkthrough/8-completed-release.md | 30 ++++++-----
 9 files changed, 93 insertions(+), 119 deletions(-)

diff --git a/README.md b/README.md
index aea30079..9411ce3a 100644
--- a/README.md
+++ b/README.md
@@ -29,7 +29,7 @@ Please leave this repository open in a browser tab so that you can follow along
 
 ## Next
 
-Next we will walk through the process of creating a Fork repository and setting up a local clone.
+Next we will walk through the process of creating a GitHub Fork and local clone of this repository.
 
 [Go](/walkthrough/1-setup.md)
 
diff --git a/walkthrough/1-setup.md b/walkthrough/1-setup.md
index 11d94354..94fab5b1 100644
--- a/walkthrough/1-setup.md
+++ b/walkthrough/1-setup.md
@@ -1,6 +1,6 @@
 # 1. Setup
 
-In order to contribute to a GitHub project, you will need two things: a Fork of the project and a local clone of your Fork.
+In order to contribute to a GitHub project, you will need two things: a GitHub Fork and a local clone of this project.
 
 ## :running: Activities
 
@@ -27,10 +27,10 @@ Fork the source repository:
 
 __All Team Members__
 
-Clone your fork to your local machine:
+Clone this project to your local machine:
 ```sh
 $ cd ~/my/parent/directory
-$ git clone https://github.com/your-username/repository-name.git
+$ git clone https://github.com/source-username/repository-name.git
 # clone the fork repository from GitHub
 
 $ cd repository-name
@@ -43,16 +43,16 @@ $ git remote
 origin
 
 $ git remote -v
-origin https://github.com/your-username/repository-name.git (fetch)
-origin https://github.com/your-username/repository-name.git (push)
+origin https://github.com/source-username/repository-name.git (fetch)
+origin https://github.com/source-username/repository-name.git (push)
 ```
 
-You should see an `origin` remote that points to your GitHub fork:
+You should see an `origin` remote that points to the source GitHub project:
 ```sh
 $ git remote show origin
 * remote origin
-  Fetch URL: https://github.com/your-username/repository-name.git
-  Push  URL: https://github.com/your-username/repository-name.git
+  Fetch URL: https://github.com/source-username/repository-name.git
+  Push  URL: https://github.com/source-username/repository-name.git
   HEAD branch: master
   Remote branches:
     develop tracked
@@ -91,66 +91,54 @@ $ git branch -a
 
 ---
 
-### 3 - Add Remote for Source Repository
+### 3 - Add Remote for your GitHub Fork
 
 __All Team Members__
 
-Add a `source` remote:
+Add a `me` remote:
 ```sh
-$ git remote add source https://github.com/source-username/repository-name.git
-# add the source remote
+$ git remote add me https://github.com/your-username/repository-name.git
+# add the me remote
 
 $ git remote -v
-origin https://github.com/your-username/repository-name.git (fetch)
-origin https://github.com/your-username/repository-name.git (push)
-source https://github.com/source-username/repository-name.git (fetch)
-source https://github.com/source-username/repository-name.git (push)
+origin https://github.com/source-username/repository-name.git (fetch)
+origin https://github.com/source-username/repository-name.git (push)
+me https://github.com/your-username/repository-name.git (fetch)
+me https://github.com/your-username/repository-name.git (push)
 ```
 
-You should see a `source` remote that points to the upstream GitHub source repository:
+You should see a `me` remote that points to your GitHub Fork repository:
 ```sh
-$ git remote show source
-* remote origin
-  Fetch URL: https://github.com/source-username/repository-name.git
-  Push  URL: https://github.com/source-username/repository-name.git
+$ git remote show me
+* remote me
+  Fetch URL: https://github.com/your-username/repository-name.git
+  Push  URL: https://github.com/your-username/repository-name.git
   HEAD branch: master
   Remote branches:
-    develop new (next fetch will store in remotes/source)
-    master  new (next fetch will store in remotes/source)
+    develop new (next fetch will store in remotes/me)
+    master  new (next fetch will store in remotes/me)
   Local ref configured for 'git push':
     master  pushes to master (up to date)
 ```
 
 Maintainers will need to create branches and push directly to the source repository.
 
-All team members will need to pull changes from the source repository and merge them into
-their own branches.
+All team members will need to pull changes from the source repository in order to branch from for feature branches.
 
-Fetch branch data from the `source` remote:
+Fetch branch data from the `origin` remote:
 ```sh
-$ git fetch source
+$ git fetch origin
 From https://github.com/source-username/repository-name
-* [new branch]      develop    -> source/develop
-* [new branch]      master     -> source/master
+* [new branch]      develop    -> origin/develop
+* [new branch]      master     -> origin/master
 
 $ git branch -a
 * master
   remotes/origin/HEAD -> origin/master
   remotes/origin/develop
   remotes/origin/master
-  remotes/source/develop
-  remotes/source/master
-
-$ git remote show source
-* remote source
-  Fetch URL: https://github.com/source-username/repository-name.git
-  Push  URL: https://github.com/source-username/repository-name.git
-  HEAD branch: master
-  Remote branches:
-    develop tracked
-    master tracked
-  Local ref configured for 'git push':
-     master pushes to master (up to date)
+  remotes/me/develop
+  remotes/me/master
 ```
 
 ---
@@ -171,13 +159,13 @@ $ git branch
 * master
 ```
 
-Create a `develop` branch that tracks from your GitHub fork's `develop` branch:
+Create a `develop` branch that tracks from `origin`'s `develop` branch:
 ```sh
-$ git branch develop origin/develop
+$ git checkout -b develop --track origin/develop
 Branch develop set up to track remote branch develop from origin
 ```
 
-Notice that viewing the details for the `origin` remote indicates that the local `develop` and `master` branches are configured to push to and pull from your GitHub fork's branches:
+Notice that viewing the details for the `origin` remote indicates that the local `develop` and `master` branches are configured to push to and pull from the source GitHub repository's branches:
 ```sh
 $ git remote show origin
 ...
@@ -192,8 +180,8 @@ $ git remote show origin
 :bulb: The `-vv` flag for the `git branch` command will also show the remote branches that are tracked by your local branches (in brackets):
 ```sh
 $ git branch -vv
-  develop 3e03a92 [origin/develop] Create example app
-* master  3e03a92 [origin/master] Create example app
+* develop 3e03a92 [origin/develop] Create example app
+  master  3e03a92 [origin/master] Create example app
 ```
 
 You should now be ready to move on to the rest of the walkthrough. If you'd like to see the repository you've created on your local machine in GitHub desktop, you can add a repository by choosing a local path.
diff --git a/walkthrough/2-feature-branches.md b/walkthrough/2-feature-branches.md
index 70467265..255f6641 100644
--- a/walkthrough/2-feature-branches.md
+++ b/walkthrough/2-feature-branches.md
@@ -27,12 +27,12 @@ Create a feature branch off of the `develop` branch that contains the writer's n
 ```sh
 $ git checkout develop
 
-$ git branch cuba-pudding-jr-feb
+$ git checkout -b cuba-pudding-jr-feb
 
 $ git branch
-  cuba-pudding-jr-feb
+* cuba-pudding-jr-feb
   develop
-* master
+  master
 ```
 
 :bulb: Feature branches will be named such that someone else can look at what branches are in progress and get a rough idea of what work is being done on each branch.
@@ -48,10 +48,9 @@ $ git branch
   master
 ```
 
-:bulb: You can simplify the last two steps to create and switch to a branch with a single command:
+:bulb: You can create a branch without immediately checking out the branch via the `git branch` command:
 ```sh
-$ git checkout -b cuba-pudding-jr-feb
-Switched to a new branch 'cuba-pudding-jr-feb'
+$ git branch cuba-pudding-jr-feb
 ```
 
 ---
@@ -150,9 +149,8 @@ If you see that you have changes to unexpected lines, please correct them at thi
 
 Stage all of the changes that you've made thus far:
 ```sh
-$ git add -A
-# Careful, -A stages changes to all tracked files, untracks files that have been
-# removed, and tracks files that have been added.
+$ git add app/*
+# Careful, using a wildcard adds any file that has changed that matches the pattern.
 
 $ git status
 On branch cuba-pudding-jr-feb
@@ -185,10 +183,13 @@ $ git commit -m "Adding Cuba Pudding Jr.'s Feb Recipe"
 
 Now that your changes have been committed, let's get them published to your Fork on GitHub:
 ```sh
-$ git push origin cuba-pudding-jr-feb
+$ git push -u me HEAD
 ```
 
-:bulb: Make sure you type the correct branch name.
+:bulb: Specifying the HEAD reference instructs git to push to the same branch as the HEAD of your local project, which is currently your feature branch.
+
+:bulb: The `-u` flag instructs git to link your local branch with the remote's branch so that future push & pull commands do not require you
+to specify where you would like to push or pull code from.
 
 Navigate to your Fork on Github, you should now see your new branch in the interface.
 
diff --git a/walkthrough/3-code-review.md b/walkthrough/3-code-review.md
index 1b6d522d..999f724a 100644
--- a/walkthrough/3-code-review.md
+++ b/walkthrough/3-code-review.md
@@ -47,10 +47,10 @@ $ git remote add teammate https://github.com/teammate-username/repository-name.g
 # add the teammate remote
 
 $ git remote -v
-origin https://github.com/your-username/repository-name.git (fetch)
-origin https://github.com/your-username/repository-name.git (push)
-source https://github.com/source-username/repository-name.git (fetch)
-source https://github.com/source-username/repository-name.git (push)
+me https://github.com/your-username/repository-name.git (fetch)
+me https://github.com/your-username/repository-name.git (push)
+origin https://github.com/source-username/repository-name.git (fetch)
+origin https://github.com/source-username/repository-name.git (push)
 teammate https://github.com/teammate-username/repository-name.git (fetch)
 teammate https://github.com/teammate-username/repository-name.git (push)
 ```
@@ -69,11 +69,15 @@ $ git branch -r --list teammate/*
 
 Checkout a tracking branch:
 ```sh
-$ git checkout -b teammate-feature-branch teammate/eggs-benny-feb
+$ git checkout eggs-benny-feb
 Branch teammate-feature-branch set up to track remote branch eggs-benny-feb from teammate.
 Switched to a new branch 'teammate-feature-branch'
 ```
 
+:bulb: As long as only one of your remotes has a branch called eggs-benny-feb, it knows to create a local tracking branch.
+
+:bulb: If you do not wish to create a tracking branch, you can check out the branch in read-only mode by fully-specifying the branch instead (e.g., `teammate/eggs-benny-feb`)
+
 Now you've switched the code in your directory to a branch containing all of the changes committed to your teammate's branch. If you have your project open in sublime or another text editor you will notice that the source files contain your teammate's changes.
 
 If you run the `git log` command you can see a log of the latest commits made to the current branch:
diff --git a/walkthrough/4-fetching-latest.md b/walkthrough/4-fetching-latest.md
index ad0133f3..2607ea7b 100644
--- a/walkthrough/4-fetching-latest.md
+++ b/walkthrough/4-fetching-latest.md
@@ -8,31 +8,17 @@ Now that mods have been merged into the development branch, it is prudent to get
 
 ## :running: Activities
 
-Follow along with the activities below to walk through the process of fetching the latest commits to the `source/develop` branch, merging them into your local `develop` branch, and publishing them back out to your GitHub fork.
+Follow along with the activities below to walk through the process of pulling the latest commits to the `origin/develop` branch into your local tracking branch.
 
-### 1 - Fetch Latest from Source
+### 1 - Pull Latest from `develop`
 
 __All Team Members__
 
-Fetch the latest commits from the source repository:
-```sh
-$ git fetch source
-```
-
-Merge the new commits contained in the `source/develop` branch into your `develop` branch:
+Pull the latest commits to the `develop` branch from the source repository:
 ```sh
 $ git checkout develop
-# switch to develop branch
 
-$ git merge source/develop
-# merge commits from source/develop into your current branch (develop)
-```
-
-Your local `develop` branch is now up to date with the source `develop` branch.
-
-Now, publish your develop branch out to your GitHub fork:
-```sh
-$ git push origin develop
+$ git pull
 ```
 
 ## Next
diff --git a/walkthrough/5-hotfix.md b/walkthrough/5-hotfix.md
index 333e5100..9aaf5ce7 100644
--- a/walkthrough/5-hotfix.md
+++ b/walkthrough/5-hotfix.md
@@ -54,11 +54,9 @@ __Maintainers__
 Choose a maintainer to publish the hotfix branch. This maintainer should push the branch to source:
 
 ```sh
-$ git push source hotfix-1.0.1
+$ git push -u origin HEAD
 ```
 
-At this time create a pull request to merge the hotfix branch into `master`, but do not yet merge.
-
 ---
 
 :cop: :raised_hand: - Please wait until everyone has caught up.
@@ -114,7 +112,7 @@ Choose a developer to publish the fixup branch and create a Pull Request against
 
 Publish the branch:
 ```sh
-$ git push origin remove-emails
+$ git push -u me HEAD
 ```
 
 Navigate to your GitHub fork and open the pull request, making sure to request to merge changes into the `hotfix-1.0.1` branch.
@@ -157,16 +155,17 @@ $ git pull
 Merge hotfix into develop, creating a new merge commit (via `--no-ff`):
 ```sh
 $ git checkout develop
-# switch to develop
 
-$ git merge hotfix-1.0.1 --no-ff -m "Merging 1.0.1"
+$ git pull
+
+$ git merge --no-ff hotfix-1.0.1
 ```
 
 :bulb: Always make sure that `develop` is up to date before merging. There may be some merge conflicts that will need to be addressed at this point.
 
-Choose a maintainer to push the the commit up to the source repository:
+Push the commit up to the source repository:
 ```sh
-$ git push source develop
+$ git push
 ```
 
 ## Next
diff --git a/walkthrough/6-release-branch.md b/walkthrough/6-release-branch.md
index 73412da4..e5d2ea90 100644
--- a/walkthrough/6-release-branch.md
+++ b/walkthrough/6-release-branch.md
@@ -14,11 +14,9 @@ __Maintainers__
 
 Bring your local develop branch up to date with the source repository:
 ```sh
-$ git fetch source
-
 $ git checkout develop
 
-$ git merge source/develop
+$ git pull
 ```
 
 Create a new branch off of `develop` named `release-1.1`:
@@ -46,17 +44,9 @@ __Maintainers__
 
 Choose a maintainer to publish the release branch to the source repository:
 ```sh
-$ git push source release-1.1
+$ git push -u origin HEAD
 ```
 
-### 3 - Open Pull Request
-
-__Maintainers__
-
-Choose a maintainer to open a pull request to merge the release branch into the `master` branch. __Do not merge the pull request at this time__. 
-
-This pull request is a good place to document all of the changes that comprise the release, perform a final review of the code that will be pushed, and comment on any issues related to the release. 
-
 ## Next
 
 Next we will walk through the process of fixing bugs in the release branch.
diff --git a/walkthrough/7-release-bugs.md b/walkthrough/7-release-bugs.md
index 984fe91a..a45813ab 100644
--- a/walkthrough/7-release-bugs.md
+++ b/walkthrough/7-release-bugs.md
@@ -14,15 +14,15 @@ Follow along with the activities below to walk through the process of fixing iss
 
 __Developers__
 
-Fetch the latest from source and create a local tracking branch for the release:
+Fetch the latest from origin and create a local tracking branch for the release:
 
 ```sh
-$ git fetch source
-# fetch latest from source
+$ git fetch origin
+# fetch latest from origin
 
 $ git checkout release-1.1
 # checkout the release branch
-Branch hotfix-1.1 set up to track remote branch release-1.1 from source.
+Branch hotfix-1.1 set up to track remote branch release-1.1 from origin.
 Switched to a new branch 'hotfix-1.0.1'
 ```
 
@@ -56,7 +56,7 @@ __Developers__
 
 The two developers from the last step should now publish their feature branches to GitHub and open up Pull Requests against the `release-1.1` branch in the source repository:
 ```sh
-$ git push origin FEATURE-BRANCH-NAME
+$ git push -u me HEAD
 ```
 
 ---
diff --git a/walkthrough/8-completed-release.md b/walkthrough/8-completed-release.md
index 4cf12f55..3868d58d 100644
--- a/walkthrough/8-completed-release.md
+++ b/walkthrough/8-completed-release.md
@@ -12,7 +12,21 @@ It is the last day of the month and no more requests have come in from the, time
 
 __Maintainers__
 
-Choose a maintainer to accept & merge the request to merge `release-1.1` into `master`.
+Choose a maintainer to merge `release-1.1` into `master`.
+
+```sh
+$ git checkout release-1.1
+
+$ git pull
+
+$ git checkout master
+
+$ git pull
+
+$ git merge --no-ff release-1.1
+
+$ git push
+```
 
 ---
 
@@ -29,20 +43,12 @@ __Maintainers__
 Next we will work to get changes made to the release merged back down into `develop`, so switch to the release branch and pull down all the latest changes:
 ```sh
 $ git checkout release-1.1
-# switch to release branch
-
-$ git pull
-# pull latest changes
-```
-
-:bulb: Running git pull on a tracking branch will automatically fetch and merge changes.
 
-Merge the release into develop, creating a new merge commit (via `--no-ff`):
-```sh
 $ git checkout develop
-# switch to develop
 
-$ git merge release-1.1 --no-ff -m "Merging 1.1"
+$ git merge --no-ff release-1.1
+
+$ git push
 ```
 
 :bulb: Always make sure that `develop` is up to date before merging. There may be some merge conflicts that will need to be addressed at this point.

From af6dfba758b8d122100c2252cc90544c17b1c4ad Mon Sep 17 00:00:00 2001
From: Russ Ferri <rferri@gr8people.com>
Date: Thu, 14 Jun 2018 11:39:34 -0400
Subject: [PATCH 16/26] Remove unneeded git checkout step

---
 walkthrough/2-feature-branches.md | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/walkthrough/2-feature-branches.md b/walkthrough/2-feature-branches.md
index 255f6641..16f54546 100644
--- a/walkthrough/2-feature-branches.md
+++ b/walkthrough/2-feature-branches.md
@@ -37,17 +37,6 @@ $ git branch
 
 :bulb: Feature branches will be named such that someone else can look at what branches are in progress and get a rough idea of what work is being done on each branch.
 
-Next, switch to the newly created feature branch:
-```sh
-$ git checkout cuba-pudding-jr-feb
-Switched to branch 'cuba-pudding-jr-feb'
-
-$ git branch
-* cuba-pudding-jr-feb
-  develop
-  master
-```
-
 :bulb: You can create a branch without immediately checking out the branch via the `git branch` command:
 ```sh
 $ git branch cuba-pudding-jr-feb

From 3b874aeb82e77571884a6d50c4075157737f5811 Mon Sep 17 00:00:00 2001
From: Russell Ferri <rferri@gr8people.com>
Date: Thu, 14 Jun 2018 15:28:15 -0400
Subject: [PATCH 17/26] Correct missed source => origin remote rename

Previously `source` was the name of the remote for the shared code. The current version of the exercise uses `origin`.
---
 walkthrough/5-hotfix.md | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/walkthrough/5-hotfix.md b/walkthrough/5-hotfix.md
index 9aaf5ce7..88182081 100644
--- a/walkthrough/5-hotfix.md
+++ b/walkthrough/5-hotfix.md
@@ -51,7 +51,7 @@ $ git commit -m "Bump version to 1.0.1"
 
 __Maintainers__
 
-Choose a maintainer to publish the hotfix branch. This maintainer should push the branch to source:
+Choose a maintainer to publish the hotfix branch. This maintainer should push the branch to origin:
 
 ```sh
 $ git push -u origin HEAD
@@ -69,15 +69,15 @@ $ git push -u origin HEAD
 
 __Developers__
 
-Fetch the latest from source and create a local tracking branch for the hotfix:
+Fetch the latest from origin and create a local tracking branch for the hotfix:
 
 ```sh
-$ git fetch source
-# fetch latest from source
+$ git fetch origin
+# fetch latest from origin
 
 $ git checkout hotfix-1.0.1
 # checkout the hotfix branch
-Branch hotfix-1.0.1 set up to track remote branch hotfix-1.0.1 from source.
+Branch hotfix-1.0.1 set up to track remote branch hotfix-1.0.1 from origin.
 Switched to a new branch 'hotfix-1.0.1'
 ```
 
@@ -163,7 +163,7 @@ $ git merge --no-ff hotfix-1.0.1
 
 :bulb: Always make sure that `develop` is up to date before merging. There may be some merge conflicts that will need to be addressed at this point.
 
-Push the commit up to the source repository:
+Push the commit up to the origin repository:
 ```sh
 $ git push
 ```

From 682d1f39838726e1587398b38eb6963fab04f04a Mon Sep 17 00:00:00 2001
From: colinflynde <80894973+colinflynde@users.noreply.github.com>
Date: Mon, 29 Mar 2021 14:15:51 +0800
Subject: [PATCH 18/26] Add files via upload

---
 app/recipe/feb/chocolate-soup.md      | 30 +++++++++++++++++++++++++++
 app/recipe/feb/grilled-peach-salad.md | 26 +++++++++++++++++++++++
 app/recipe/feb/homemade-sausages.md   | 27 ++++++++++++++++++++++++
 app/recipe/feb/vanilla-panna-cotta.md | 28 +++++++++++++++++++++++++
 4 files changed, 111 insertions(+)
 create mode 100644 app/recipe/feb/chocolate-soup.md
 create mode 100644 app/recipe/feb/grilled-peach-salad.md
 create mode 100644 app/recipe/feb/homemade-sausages.md
 create mode 100644 app/recipe/feb/vanilla-panna-cotta.md

diff --git a/app/recipe/feb/chocolate-soup.md b/app/recipe/feb/chocolate-soup.md
new file mode 100644
index 00000000..f9ea6ef9
--- /dev/null
+++ b/app/recipe/feb/chocolate-soup.md
@@ -0,0 +1,30 @@
+# Chocolate Soup
+
+This is perhaps one of the richest, yet most beautiful desserts... it's simple and simply elegant at the same time. The sweet crunch of cinnamon toasted brioche croutons with rich, smooth, deep chocolate flavours!
+
+Source: https://sortedfood.com/recipe/10702
+
+## Ingredients
+
+- 400 g brioche loaf (or rolls)
+- 150 g salted butter, melted
+- 100 g soft brown sugar
+- 1 tsp ground cinnamon
+- 500 ml milk
+- 500 ml double cream
+- 400 g dark chocolate (strong cocoa %)
+- 1 tbsp cornflour
+- 1 tbsp cocoa powder
+- 2 egg yolks
+- 50 ml milk
+- 1 tbsp cocoa nibs (optional)
+- 50 ml double cream (to drizzle)
+- 12 mint leaves (garnish)
+
+# Instructions
+
+1. Take the brioche and cut them into cubes about 2-3cm on each side. Dunk them in a bowl of melted butter, then toss in a bowl that has the brown sugar and ground cinnamon combined.
+2. Preheat an oven to 180°C. Arrange the tossed croutons on a clean non-stick baking tray and bake for 6-8 minutes until they are golden. (They will crisp up as they cool!)
+3. Heat the milk and cream up in a large saucepan until almost boiling. Snap the chocolate int much smaller squares. Drop the chocolate into the warm milk/cream and stir until it all melts and becomes sensually smooth!
+4. Stir the cocoa powder, cornflour and egg yolks together with a an extra splash of cold milk until it becomes a smooth paste. Spoon the paste into the hot soup as you whisk and it'll thicken within a minute or so.
+5. Serve a ladle of soup in a warm bowl with croutons on top, a drizzle of extra cream, scattering of crunchy cocoa nibs and a few fresh mint leaves.
diff --git a/app/recipe/feb/grilled-peach-salad.md b/app/recipe/feb/grilled-peach-salad.md
new file mode 100644
index 00000000..5ebd20b0
--- /dev/null
+++ b/app/recipe/feb/grilled-peach-salad.md
@@ -0,0 +1,26 @@
+# Grilled Peach Salad
+
+This salad is great for the summer months. It's a light lunch or great salad to accompany a BBQ. The combination of sweet grilled peaches, toasted pecans, soft salty blue cheese with honey and thyme balsamic dressing looks impressive enough to appear on any restaurant menu... yet takes just moments to make.
+
+Source: https://sortedfood.com/recipe/1135
+
+## Ingredients
+
+- 2 fresh ripe peaches
+- 1 handful rocket
+- 1 handful red chard
+- 1 chunk blue cheese
+- 1 handful walnuts
+- 2 tbsp honey
+- 2 tbsp balsamic vinegar
+- 4 tbsp olive oil
+- 1 pinch dried thyme
+- 1 granary loaf
+
+## Instructions
+
+1. Heat a cast iron griddle pan or BBQ as hot as it will go. de-stone and quarter the peaches.
+2. Season the peaches with salt and pepper and lay then onto the griddle pan. Turn them over after a couple of minutes to start to caramelise the other side.
+3. Measure the honey, vinegar, oil and thyme into a small bowl and whisk together with a little salt and pepper.
+4. Wash, drain and mix the salad leaves together and drop them onto a serving plate from a little height so they find there own space.
+5. Arrange the grilled peaches onto the leaves, crumble over the blue cheese and scatter the walnuts. Drizzle the dressing over the salad and serve immediately. Serves 2
diff --git a/app/recipe/feb/homemade-sausages.md b/app/recipe/feb/homemade-sausages.md
new file mode 100644
index 00000000..1b855aaa
--- /dev/null
+++ b/app/recipe/feb/homemade-sausages.md
@@ -0,0 +1,27 @@
+# Homemade Sausages
+
+A sausage is a universally used ingredient... every nation has one they're proud of and we're going to show you our favourite banger! We apologise in advance for the mischief and awkward inappropriateness... but that aside... we promise the sausages are delicious.
+
+Source: https://sortedfood.com/recipe/2609
+
+## Ingredients
+
+- 800 g pork shoulder
+- 200 g pork belly
+- 1 glass red wine
+- 1 tsp mixed spice
+- 1 lemon, zested
+- 1 orange, zested
+- 1 knob(s) ginger, grated
+- 3 fresh sage leaves
+- 2 pinch(es) salt and pepper
+- 1 portion(s) pigs intestine, in salty brine
+
+## Instructions
+
+1. Reduce the glass of wine to syrup in a saucepan, keep going until you're left with about a shot glass amount. Grind the pork belly and shoulder in a machine to give you minced meat. (You can simply buy sausage meat from you butcher if you want to skip this stage.)
+2. Mix the minced meat with salt, pepper, zest of both citrus fruit, the grated ginger, chopped sage and red wine syrup.
+3. Thread the intestine onto the horn of the sausage machine and pull it right over the tip. Feed the flavoured sausage meat into machine and once it reaches the end of the horn pull the intestine back over the end and tie a knot.
+4. Fill the intestine evenly and equally, not forcing too much in, so you have one long sausage. Tie the end.
+5. Twist the string of sausage into 6 inch sausages, making sure each twist is in the opposite direction to the last.
+6. Prick the sausages all over and grill for a few minutes on each side. Makes a dozen.
diff --git a/app/recipe/feb/vanilla-panna-cotta.md b/app/recipe/feb/vanilla-panna-cotta.md
new file mode 100644
index 00000000..b85977c4
--- /dev/null
+++ b/app/recipe/feb/vanilla-panna-cotta.md
@@ -0,0 +1,28 @@
+# Vanilla Panna Cotta
+
+Got someone you really need to impress but don't want to spend all night in the kitchen? This dessert can all be done the day before, but is sure to blow their socks off!
+
+Source: https://sortedfood.com/recipe/971
+
+## Ingredients
+
+- 3 gelatine leaves
+- 400 ml double cream
+- 1 lemon
+- 1 vanilla pod
+- 75 g icing sugar
+- 1 handful fresh strawberries
+- 1 handful fresh raspberries
+- 1 handful fresh blueberries
+- 1 glass rose wine
+- 1 tbsp sugar
+- 1 sprig fresh mint
+
+## Instructions
+
+1. Soak the gelatine leaves in a little cold water to soften. Zest the lemon and put into a pan. Half the vanilla pod and scrape out the seeds. Put both the pod and seeds into the pan with the zest.
+2. Pour ¾ of the cream into a pan and bring to the boil. Squeeze all excess water from the gelatine and whisk through the hot cream. Leave to cool.
+3. Whisk what is left of the cream and fold through the slightly cooled cream. Divide into 4 individual jelly moulds, ramekins or espresso cups and put into the fridge to set overnight.
+4. Cut up all the berries and leave to soak in the rose with a spoonful of sugar overnight.
+5. Dunk the moulds into hot water to loosen the panna cottas and turn out onto a plate.
+6. Scatter with macerated berries and garnish with a sprig of mint. Serves 4

From 773b81289c76e1231a121a72d4a5c7ef77e4bf9e Mon Sep 17 00:00:00 2001
From: Remy Lim Wee Meng <81542313+Lim-Wee-Meng@users.noreply.github.com>
Date: Mon, 29 Mar 2021 14:25:56 +0800
Subject: [PATCH 19/26] Update Chocolate-Soup.md

Silky Smooth Chocolate Soup
---
 app/recipe/feb/chocolate-soup.md | 48 +++++++++++++++++---------------
 1 file changed, 26 insertions(+), 22 deletions(-)

diff --git a/app/recipe/feb/chocolate-soup.md b/app/recipe/feb/chocolate-soup.md
index f9ea6ef9..5b400576 100644
--- a/app/recipe/feb/chocolate-soup.md
+++ b/app/recipe/feb/chocolate-soup.md
@@ -1,30 +1,34 @@
-# Chocolate Soup
+# Silky Smooth Chocolate Soup
 
-This is perhaps one of the richest, yet most beautiful desserts... it's simple and simply elegant at the same time. The sweet crunch of cinnamon toasted brioche croutons with rich, smooth, deep chocolate flavours!
+Somewhere between hot chocolate and warm chocolate pudding, my Chocolate Soup recipe is a perfectly sweet bowl of the chocolate flavor you crave.
 
-Source: https://sortedfood.com/recipe/10702
+Source: https://www.biggerbolderbaking.com/silky-smooth-chocolate-soup/
 
 ## Ingredients
 
-- 400 g brioche loaf (or rolls)
-- 150 g salted butter, melted
-- 100 g soft brown sugar
-- 1 tsp ground cinnamon
-- 500 ml milk
-- 500 ml double cream
-- 400 g dark chocolate (strong cocoa %)
-- 1 tbsp cornflour
-- 1 tbsp cocoa powder
-- 2 egg yolks
-- 50 ml milk
-- 1 tbsp cocoa nibs (optional)
-- 50 ml double cream (to drizzle)
-- 12 mint leaves (garnish)
+- 3 cups (24floz/675ml) full-fat milk
+- 1 cup (8floz/225ml) heavy cream
+- 2 cups (12oz/340g) chopped bittersweet chocolate
 
+- 3 tablespoons cornstarch
+- 2 tablespoons water
+- 1/2 teaspoon salt
+- 2 teaspoons pure vanilla extract
+- Whipped cream for serving
+- Grated chocolate for serving (optional)
+- 
 # Instructions
 
-1. Take the brioche and cut them into cubes about 2-3cm on each side. Dunk them in a bowl of melted butter, then toss in a bowl that has the brown sugar and ground cinnamon combined.
-2. Preheat an oven to 180°C. Arrange the tossed croutons on a clean non-stick baking tray and bake for 6-8 minutes until they are golden. (They will crisp up as they cool!)
-3. Heat the milk and cream up in a large saucepan until almost boiling. Snap the chocolate int much smaller squares. Drop the chocolate into the warm milk/cream and stir until it all melts and becomes sensually smooth!
-4. Stir the cocoa powder, cornflour and egg yolks together with a an extra splash of cold milk until it becomes a smooth paste. Spoon the paste into the hot soup as you whisk and it'll thicken within a minute or so.
-5. Serve a ladle of soup in a warm bowl with croutons on top, a drizzle of extra cream, scattering of crunchy cocoa nibs and a few fresh mint leaves.
+1. In a medium saucepan, combine the milk and cream and bring to a simmer over medium heat.
+
+2. Reduce the heat to low, add the chocolate and whisk until the chocolate starts to melt.
+
+3. Meanwhile, in a small bowl, mix the cornstarch and the water together to form a runny paste. This will be stiff at first, but keep mixing until combined and smooth.
+
+4. When the chocolate mixture comes to a simmer, add the cornstarch paste and cook, whisking continuously, for 1 minute, until the soup is thick and smooth.
+
+5. Reduce the heat to very low and simmer for 2-3 minutes to cook out the raw taste of the cornstarch.
+
+6. Turn off the heat and whisk in the salt and vanilla. Pass the soup through a sieve for a smooth silky result.
+
+7. Divide the soup among six serving bowls and garnish with some freshly whipped cream and grated chocolate if you'd like. Enjoy warm.

From 7e9b03d65e4dd5544364dfbe1aaaccf0a9b31368 Mon Sep 17 00:00:00 2001
From: Tang Wei Xun <w31.xun.tang@gmail.com>
Date: Mon, 29 Mar 2021 14:34:19 +0800
Subject: [PATCH 20/26] vanilla-panna-cotta modified

---
 app/recipe/feb/vanilla-panna-cotta.md | 35 +++++++++++++--------------
 1 file changed, 17 insertions(+), 18 deletions(-)

diff --git a/app/recipe/feb/vanilla-panna-cotta.md b/app/recipe/feb/vanilla-panna-cotta.md
index b85977c4..274a4bbc 100644
--- a/app/recipe/feb/vanilla-panna-cotta.md
+++ b/app/recipe/feb/vanilla-panna-cotta.md
@@ -2,27 +2,26 @@
 
 Got someone you really need to impress but don't want to spend all night in the kitchen? This dessert can all be done the day before, but is sure to blow their socks off!
 
-Source: https://sortedfood.com/recipe/971
+Source: https://www.bbcgoodfood.com/recipes/vanilla-panna-cotta
 
 ## Ingredients
 
-- 3 gelatine leaves
-- 400 ml double cream
-- 1 lemon
-- 1 vanilla pod
-- 75 g icing sugar
-- 1 handful fresh strawberries
-- 1 handful fresh raspberries
-- 1 handful fresh blueberries
-- 1 glass rose wine
-- 1 tbsp sugar
-- 1 sprig fresh mint
+- 2 ½ sheets gelatine
+- 150ml milk
+- 400ml double cream
+- 60g caster sugar
+- 1 vanilla pod, split lengthways
+- fresh strawberries, to serve
+- strawberry compote, to serve
 
 ## Instructions
 
-1. Soak the gelatine leaves in a little cold water to soften. Zest the lemon and put into a pan. Half the vanilla pod and scrape out the seeds. Put both the pod and seeds into the pan with the zest.
-2. Pour ¾ of the cream into a pan and bring to the boil. Squeeze all excess water from the gelatine and whisk through the hot cream. Leave to cool.
-3. Whisk what is left of the cream and fold through the slightly cooled cream. Divide into 4 individual jelly moulds, ramekins or espresso cups and put into the fridge to set overnight.
-4. Cut up all the berries and leave to soak in the rose with a spoonful of sugar overnight.
-5. Dunk the moulds into hot water to loosen the panna cottas and turn out onto a plate.
-6. Scatter with macerated berries and garnish with a sprig of mint. Serves 4
+Method
+STEP 1
+Add the sheets of gelatine to a bowl of cold water and soak for 5 mins.
+
+STEP 2
+Pour the milk and cream into a saucepan with the sugar and vanilla seeds (to scrape the seeds out of the pod, use the back of a knife). Stir to combine and bring to a simmer, then remove from the heat. Take the gelatine out of the cold water and squeeze out the excess, then add to the milk mixture. Stir until completely dissolved. Tip into four ramekins and place in the fridge to set for at least a couple of hours.
+
+STEP 3
+To serve, turn each ramekin upside-down onto a serving plate. If the panna cotta won't drop out, carefully dip the ramekin in a bowl of warm water to loosen it. Serve with a drizzle of strawberry compote and sliced fresh strawberries.

From 139c3f432b3aae9ed5bd78889df8ac221e3add1f Mon Sep 17 00:00:00 2001
From: MarcosGza <gazali.ahmad@gmail.com>
Date: Mon, 29 Mar 2021 14:40:29 +0800
Subject: [PATCH 21/26] Comment

---
 app/recipe/feb/homemade-sausages.md | 51 ++++++++++++++++++-----------
 1 file changed, 32 insertions(+), 19 deletions(-)

diff --git a/app/recipe/feb/homemade-sausages.md b/app/recipe/feb/homemade-sausages.md
index 1b855aaa..0a4d5c52 100644
--- a/app/recipe/feb/homemade-sausages.md
+++ b/app/recipe/feb/homemade-sausages.md
@@ -1,27 +1,40 @@
-# Homemade Sausages
+# Homemade Pork Breakfast Sausage
 
-A sausage is a universally used ingredient... every nation has one they're proud of and we're going to show you our favourite banger! We apologise in advance for the mischief and awkward inappropriateness... but that aside... we promise the sausages are delicious.
+In general, homemade is better than store-bought, and this spiced pork sausage is no exception. Taking a mere 15 minutes, and calling for just ground pork and pantry spices, this sausage mixture makes breakfast patties with a kick; if you want a milder sausage, feel free to leave out the cayenne and red pepper flakes or use a little less.
+
+
+For even fresher sausage, grind pork loin or lean pork shoulder with a meat grinder or mince it in the food processor. Remember to cook ground pork to a minimum of 160 F, using a​ food thermometer to check the temperature. To always have homemade breakfast sausage on hand, multiply the recipe, cook all of the sausage patties, and freeze some for later. Serve with your favorite egg dishes and a side of fruit.
+
+Source: https://www.thespruceeats.com/homemade-pork-breakfast-sausage-3060593
 
-Source: https://sortedfood.com/recipe/2609
 
 ## Ingredients
 
-- 800 g pork shoulder
-- 200 g pork belly
-- 1 glass red wine
-- 1 tsp mixed spice
-- 1 lemon, zested
-- 1 orange, zested
-- 1 knob(s) ginger, grated
-- 3 fresh sage leaves
-- 2 pinch(es) salt and pepper
-- 1 portion(s) pigs intestine, in salty brine
+- 1 pound lean ground pork
+- 1/2 teaspoon kosher salt
+- 1/2 teaspoon freshly ground black pepper
+- 1/2 teaspoon ground thyme
+- 1/2 teaspoon dried rubbed sage
+- 1 teaspoon light or dark brown sugar, packed
+- 1/4 teaspoon ground allspice
+- 1/8 teaspoon ground nutmeg
+- 1/8 teaspoon onion powder
+- 1/8 teaspoon cayenne pepper
+- 1/8 teaspoon red pepper flakes, optional
+- Oil, for pan-frying
 
 ## Instructions
 
-1. Reduce the glass of wine to syrup in a saucepan, keep going until you're left with about a shot glass amount. Grind the pork belly and shoulder in a machine to give you minced meat. (You can simply buy sausage meat from you butcher if you want to skip this stage.)
-2. Mix the minced meat with salt, pepper, zest of both citrus fruit, the grated ginger, chopped sage and red wine syrup.
-3. Thread the intestine onto the horn of the sausage machine and pull it right over the tip. Feed the flavoured sausage meat into machine and once it reaches the end of the horn pull the intestine back over the end and tie a knot.
-4. Fill the intestine evenly and equally, not forcing too much in, so you have one long sausage. Tie the end.
-5. Twist the string of sausage into 6 inch sausages, making sure each twist is in the opposite direction to the last.
-6. Prick the sausages all over and grill for a few minutes on each side. Makes a dozen.
+1. Gather the ingredients.
+2. In a bowl, combine all of the ingredients and mix with your hands until well blended.
+3. Heat a little oil in a skillet over medium heat.
+4. Shape the pork mixture into eight (2-ounce) patties and pan-fry, for about 8 to 10 minutes, turning to brown both sides, until the internal temperature is at least 160 F on a food thermometer.
+5. Serve hot with your favorite breakfast dishes.
+
+# Recipe Variations
+For a traditional sage flavor, use 2 teaspoons of dried rubbed sage and omit the thyme, cayenne pepper, and red pepper flakes.
+For a healthier version, substitute ground turkey meat for the pork, which will lower the level of saturated fat.
+
+# Question
+Is There a Difference Between Breakfast Sausage Patties and Links?
+In addition to the differences in shape, there are other variations between breakfast patties and links. Some links have a casing while patties do not, and patties are often more strongly flavored compared to the links.

From 40fafd7ac962e0173185386db88dccc15ef5ec96 Mon Sep 17 00:00:00 2001
From: colinflynde <colindrysdale@outlook.com>
Date: Mon, 29 Mar 2021 14:44:54 +0800
Subject: [PATCH 22/26] message

---
 app/recipe/feb/chocolate-soup.md      | 30 +++++++++++++++++++++++++++
 app/recipe/feb/grilled-peach-salad.md | 26 +++++++++++++++++++++++
 app/recipe/feb/homemade-sausages.md   | 27 ++++++++++++++++++++++++
 app/recipe/feb/vanilla-panna-cotta.md | 28 +++++++++++++++++++++++++
 4 files changed, 111 insertions(+)
 create mode 100644 app/recipe/feb/chocolate-soup.md
 create mode 100644 app/recipe/feb/grilled-peach-salad.md
 create mode 100644 app/recipe/feb/homemade-sausages.md
 create mode 100644 app/recipe/feb/vanilla-panna-cotta.md

diff --git a/app/recipe/feb/chocolate-soup.md b/app/recipe/feb/chocolate-soup.md
new file mode 100644
index 00000000..a2870edb
--- /dev/null
+++ b/app/recipe/feb/chocolate-soup.md
@@ -0,0 +1,30 @@
+# Chocolate Soup
+
+This is perhaps one of the richest, yet most beautiful desserts... it's simple and simply elegant at the same time. The sweet crunch of cinnamon toasted brioche croutons with rich, smooth, deep chocolate flavours!
+
+Source: https://sortedfood.com/recipe/10702
+
+## Ingredients
+
+- 400 g brioche loaf (or rolls)
+- 150 g salted butter, melted
+- 100 g soft brown sugar
+- 1 tsp ground cinnamon
+- 500 ml milk
+- 500 ml double cream
+- 400 g dark chocolate (strong cocoa %)
+- 1 tbsp cornflour
+- 1 tbsp cocoa powder
+- 2 egg yolks
+- 50 ml milk
+- 1 tbsp cocoa nibs (optional)
+- 50 ml double cream (to drizzle)
+- 12 mint leaves (garnish)
+
+# Instructions
+
+1. Take the brioche and cut them into cubes about 2-3cm on each side. Dunk them in a bowl of melted butter, then toss in a bowl that has the brown sugar and ground cinnamon combined.
+2. Preheat an oven to 180°C. Arrange the tossed croutons on a clean non-stick baking tray and bake for 6-8 minutes until they are golden. (They will crisp up as they cool!)
+3. Heat the milk and cream up in a large saucepan until almost boiling. Snap the chocolate int much smaller squares. Drop the chocolate into the warm milk/cream and stir until it all melts and becomes sensually smooth!
+4. Stir the cocoa powder, cornflour and egg yolks together with a an extra splash of cold milk until it becomes a smooth paste. Spoon the paste into the hot soup as you whisk and it'll thicken within a minute or so.
+5. Serve a ladle of soup in a warm bowl with croutons on top, a drizzle of extra cream, scattering of crunchy cocoa nibs and a few fresh mint leaves.
diff --git a/app/recipe/feb/grilled-peach-salad.md b/app/recipe/feb/grilled-peach-salad.md
new file mode 100644
index 00000000..33bafad3
--- /dev/null
+++ b/app/recipe/feb/grilled-peach-salad.md
@@ -0,0 +1,26 @@
+# Grilled Peach Salad
+
+Grilled Peach Salad is the ultimate summer side dish recipe. The peaches are grilled until smoky and extra sweet and served with arugula, blueberries, candied curry pecans, and a honey vinaigrette. Add some goat cheese or (paleo-friendly!) diced avocado and you've just made the best grilled salad ever.
+
+Source: https://www.theendlessmeal.com/grilled-peach-salad/
+
+## Ingredients
+
+- 99 fresh ripe peaches
+- 99 handful rocket
+- 99 handful red chard
+- 99 chunk blue cheese
+- 99 handful walnuts
+- 99 tbsp honey
+- 99 tbsp balsamic vinegar
+- 99 tbsp olive oil
+- 99 pinch dried thyme
+- 99 granary loaf
+
+## Instructions
+
+1. Heat a cast iron griddle pan or BBQ as hot as it will go. de-stone and quarter the peaches.
+2. Season the peaches with salt and pepper and lay then onto the griddle pan. Turn them over after a couple of minutes to start to caramelise the other side.
+3. Measure the honey, vinegar, oil and thyme into a small bowl and whisk together with a little salt and pepper.
+4. Wash, drain and mix the salad leaves together and drop them onto a serving plate from a little height so they find there own space.
+5. Arrange the grilled peaches onto the leaves, crumble over the blue cheese and scatter the walnuts. Drizzle the dressing over the salad and serve immediately. Serves 2
diff --git a/app/recipe/feb/homemade-sausages.md b/app/recipe/feb/homemade-sausages.md
new file mode 100644
index 00000000..603f50ea
--- /dev/null
+++ b/app/recipe/feb/homemade-sausages.md
@@ -0,0 +1,27 @@
+# Homemade Sausages
+
+A sausage is a universally used ingredient... every nation has one they're proud of and we're going to show you our favourite banger! We apologise in advance for the mischief and awkward inappropriateness... but that aside... we promise the sausages are delicious.
+
+Source: https://sortedfood.com/recipe/2609
+
+## Ingredients
+
+- 800 g pork shoulder
+- 200 g pork belly
+- 1 glass red wine
+- 1 tsp mixed spice
+- 1 lemon, zested
+- 1 orange, zested
+- 1 knob(s) ginger, grated
+- 3 fresh sage leaves
+- 2 pinch(es) salt and pepper
+- 1 portion(s) pigs intestine, in salty brine
+
+## Instructions
+
+1. Reduce the glass of wine to syrup in a saucepan, keep going until you're left with about a shot glass amount. Grind the pork belly and shoulder in a machine to give you minced meat. (You can simply buy sausage meat from you butcher if you want to skip this stage.)
+2. Mix the minced meat with salt, pepper, zest of both citrus fruit, the grated ginger, chopped sage and red wine syrup.
+3. Thread the intestine onto the horn of the sausage machine and pull it right over the tip. Feed the flavoured sausage meat into machine and once it reaches the end of the horn pull the intestine back over the end and tie a knot.
+4. Fill the intestine evenly and equally, not forcing too much in, so you have one long sausage. Tie the end.
+5. Twist the string of sausage into 6 inch sausages, making sure each twist is in the opposite direction to the last.
+6. Prick the sausages all over and grill for a few minutes on each side. Makes a dozen.
diff --git a/app/recipe/feb/vanilla-panna-cotta.md b/app/recipe/feb/vanilla-panna-cotta.md
new file mode 100644
index 00000000..40ddf057
--- /dev/null
+++ b/app/recipe/feb/vanilla-panna-cotta.md
@@ -0,0 +1,28 @@
+# Vanilla Panna Cotta
+
+Got someone you really need to impress but don't want to spend all night in the kitchen? This dessert can all be done the day before, but is sure to blow their socks off!
+
+Source: https://sortedfood.com/recipe/971
+
+## Ingredients
+
+- 3 gelatine leaves
+- 400 ml double cream
+- 1 lemon
+- 1 vanilla pod
+- 75 g icing sugar
+- 1 handful fresh strawberries
+- 1 handful fresh raspberries
+- 1 handful fresh blueberries
+- 1 glass rose wine
+- 1 tbsp sugar
+- 1 sprig fresh mint
+
+## Instructions
+
+1. Soak the gelatine leaves in a little cold water to soften. Zest the lemon and put into a pan. Half the vanilla pod and scrape out the seeds. Put both the pod and seeds into the pan with the zest.
+2. Pour ¾ of the cream into a pan and bring to the boil. Squeeze all excess water from the gelatine and whisk through the hot cream. Leave to cool.
+3. Whisk what is left of the cream and fold through the slightly cooled cream. Divide into 4 individual jelly moulds, ramekins or espresso cups and put into the fridge to set overnight.
+4. Cut up all the berries and leave to soak in the rose with a spoonful of sugar overnight.
+5. Dunk the moulds into hot water to loosen the panna cottas and turn out onto a plate.
+6. Scatter with macerated berries and garnish with a sprig of mint. Serves 4

From 59502bd4001a17e27ab5ac34f341b48b1ebb0052 Mon Sep 17 00:00:00 2001
From: MarcosGza <gazali.ahmad@gmail.com>
Date: Mon, 29 Mar 2021 15:00:42 +0800
Subject: [PATCH 23/26] Update homemade-sausages.md

---
 app/recipe/feb/homemade-sausages.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/recipe/feb/homemade-sausages.md b/app/recipe/feb/homemade-sausages.md
index 0a4d5c52..0e420d2c 100644
--- a/app/recipe/feb/homemade-sausages.md
+++ b/app/recipe/feb/homemade-sausages.md
@@ -37,4 +37,5 @@ For a healthier version, substitute ground turkey meat for the pork, which will
 
 # Question
 Is There a Difference Between Breakfast Sausage Patties and Links?
+
 In addition to the differences in shape, there are other variations between breakfast patties and links. Some links have a casing while patties do not, and patties are often more strongly flavored compared to the links.

From 6c77226455b4d22c8a85fb48454a6701f5782711 Mon Sep 17 00:00:00 2001
From: Tang Wei Xun <w31.xun.tang@gmail.com>
Date: Mon, 29 Mar 2021 15:16:33 +0800
Subject: [PATCH 24/26] remove duplicate from vanilla

---
 app/recipe/feb/vanilla-panna-cotta.md | 30 ---------------------------
 1 file changed, 30 deletions(-)

diff --git a/app/recipe/feb/vanilla-panna-cotta.md b/app/recipe/feb/vanilla-panna-cotta.md
index e4d7ff4c..40ddf057 100644
--- a/app/recipe/feb/vanilla-panna-cotta.md
+++ b/app/recipe/feb/vanilla-panna-cotta.md
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 # Vanilla Panna Cotta
 
 Got someone you really need to impress but don't want to spend all night in the kitchen? This dessert can all be done the day before, but is sure to blow their socks off!
@@ -27,32 +26,3 @@ Source: https://sortedfood.com/recipe/971
 4. Cut up all the berries and leave to soak in the rose with a spoonful of sugar overnight.
 5. Dunk the moulds into hot water to loosen the panna cottas and turn out onto a plate.
 6. Scatter with macerated berries and garnish with a sprig of mint. Serves 4
-=======
-# Vanilla Panna Cotta
-
-Got someone you really need to impress but don't want to spend all night in the kitchen? This dessert can all be done the day before, but is sure to blow their socks off!
-
-Source: https://www.bbcgoodfood.com/recipes/vanilla-panna-cotta
-
-## Ingredients
-
-- 2 ½ sheets gelatine
-- 150ml milk
-- 400ml double cream
-- 60g caster sugar
-- 1 vanilla pod, split lengthways
-- fresh strawberries, to serve
-- strawberry compote, to serve
-
-## Instructions
-
-Method
-STEP 1
-Add the sheets of gelatine to a bowl of cold water and soak for 5 mins.
-
-STEP 2
-Pour the milk and cream into a saucepan with the sugar and vanilla seeds (to scrape the seeds out of the pod, use the back of a knife). Stir to combine and bring to a simmer, then remove from the heat. Take the gelatine out of the cold water and squeeze out the excess, then add to the milk mixture. Stir until completely dissolved. Tip into four ramekins and place in the fridge to set for at least a couple of hours.
-
-STEP 3
-To serve, turn each ramekin upside-down onto a serving plate. If the panna cotta won't drop out, carefully dip the ramekin in a bowl of warm water to loosen it. Serve with a drizzle of strawberry compote and sliced fresh strawberries.
->>>>>>> 5e05efc2937aa54db810c2cac4bc6ec3c466cda2

From 62067474dc0d76973248328226030f511c07ee8a Mon Sep 17 00:00:00 2001
From: Tang Wei Xun <w31.xun.tang@gmail.com>
Date: Mon, 29 Mar 2021 15:24:42 +0800
Subject: [PATCH 25/26] revert vanilla back to feb copy

---
 app/recipe/feb/vanilla-panna-cotta.md | 36 +++++++++++++--------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/app/recipe/feb/vanilla-panna-cotta.md b/app/recipe/feb/vanilla-panna-cotta.md
index 40ddf057..01716c95 100644
--- a/app/recipe/feb/vanilla-panna-cotta.md
+++ b/app/recipe/feb/vanilla-panna-cotta.md
@@ -2,27 +2,27 @@
 
 Got someone you really need to impress but don't want to spend all night in the kitchen? This dessert can all be done the day before, but is sure to blow their socks off!
 
-Source: https://sortedfood.com/recipe/971
+Source: https://www.bbcgoodfood.com/recipes/vanilla-panna-cotta
 
 ## Ingredients
 
-- 3 gelatine leaves
-- 400 ml double cream
-- 1 lemon
-- 1 vanilla pod
-- 75 g icing sugar
-- 1 handful fresh strawberries
-- 1 handful fresh raspberries
-- 1 handful fresh blueberries
-- 1 glass rose wine
-- 1 tbsp sugar
-- 1 sprig fresh mint
+- 2 ½ sheets gelatine
+- 150ml milk
+- 400ml double cream
+- 60g caster sugar
+- 1 vanilla pod, split lengthways
+- fresh strawberries, to serve
+- strawberry compote, to serve
 
 ## Instructions
 
-1. Soak the gelatine leaves in a little cold water to soften. Zest the lemon and put into a pan. Half the vanilla pod and scrape out the seeds. Put both the pod and seeds into the pan with the zest.
-2. Pour ¾ of the cream into a pan and bring to the boil. Squeeze all excess water from the gelatine and whisk through the hot cream. Leave to cool.
-3. Whisk what is left of the cream and fold through the slightly cooled cream. Divide into 4 individual jelly moulds, ramekins or espresso cups and put into the fridge to set overnight.
-4. Cut up all the berries and leave to soak in the rose with a spoonful of sugar overnight.
-5. Dunk the moulds into hot water to loosen the panna cottas and turn out onto a plate.
-6. Scatter with macerated berries and garnish with a sprig of mint. Serves 4
+Method
+STEP 1
+Add the sheets of gelatine to a bowl of cold water and soak for 5 mins.
+
+STEP 2
+Pour the milk and cream into a saucepan with the sugar and vanilla seeds (to scrape the seeds out of the pod, use the back of a knife). Stir to combine and bring to a simmer, then remove from the heat. Take the gelatine out of the cold water and squeeze out the excess, then add to the milk mixture. Stir until completely dissolved. Tip into four ramekins and place in the fridge to set for at least a couple of hours.
+
+STEP 3
+To serve, turn each ramekin upside-down onto a serving plate. If the panna cotta won't drop out, carefully dip the ramekin in a bowl of warm water to loosen it. Serve with a drizzle of strawberry compote and sliced fresh strawberries.
+

From cf3c347e3f8269413d01a9bfc613565fd73e2ce5 Mon Sep 17 00:00:00 2001
From: MarcosGza <gazali.ahmad@gmail.com>
Date: Mon, 29 Mar 2021 15:27:24 +0800
Subject: [PATCH 26/26] Message

---
 app/recipe/feb/homemade-sausages.md | 77 +----------------------------
 1 file changed, 2 insertions(+), 75 deletions(-)

diff --git a/app/recipe/feb/homemade-sausages.md b/app/recipe/feb/homemade-sausages.md
index 2c39b7d8..e3293ce6 100644
--- a/app/recipe/feb/homemade-sausages.md
+++ b/app/recipe/feb/homemade-sausages.md
@@ -1,75 +1,3 @@
-<<<<<<< HEAD
-# Homemade Pork Breakfast Sausage
-
-In general, homemade is better than store-bought, and this spiced pork sausage is no exception. Taking a mere 15 minutes, and calling for just ground pork and pantry spices, this sausage mixture makes breakfast patties with a kick; if you want a milder sausage, feel free to leave out the cayenne and red pepper flakes or use a little less.
-
-
-For even fresher sausage, grind pork loin or lean pork shoulder with a meat grinder or mince it in the food processor. Remember to cook ground pork to a minimum of 160 F, using a​ food thermometer to check the temperature. To always have homemade breakfast sausage on hand, multiply the recipe, cook all of the sausage patties, and freeze some for later. Serve with your favorite egg dishes and a side of fruit.
-
-Source: https://www.thespruceeats.com/homemade-pork-breakfast-sausage-3060593
-
-
-## Ingredients
-
-- 1 pound lean ground pork
-- 1/2 teaspoon kosher salt
-- 1/2 teaspoon freshly ground black pepper
-- 1/2 teaspoon ground thyme
-- 1/2 teaspoon dried rubbed sage
-- 1 teaspoon light or dark brown sugar, packed
-- 1/4 teaspoon ground allspice
-- 1/8 teaspoon ground nutmeg
-- 1/8 teaspoon onion powder
-- 1/8 teaspoon cayenne pepper
-- 1/8 teaspoon red pepper flakes, optional
-- Oil, for pan-frying
-
-## Instructions
-
-1. Gather the ingredients.
-2. In a bowl, combine all of the ingredients and mix with your hands until well blended.
-3. Heat a little oil in a skillet over medium heat.
-4. Shape the pork mixture into eight (2-ounce) patties and pan-fry, for about 8 to 10 minutes, turning to brown both sides, until the internal temperature is at least 160 F on a food thermometer.
-5. Serve hot with your favorite breakfast dishes.
-
-# Recipe Variations
-For a traditional sage flavor, use 2 teaspoons of dried rubbed sage and omit the thyme, cayenne pepper, and red pepper flakes.
-For a healthier version, substitute ground turkey meat for the pork, which will lower the level of saturated fat.
-
-# Question
-Is There a Difference Between Breakfast Sausage Patties and Links?
-
-In addition to the differences in shape, there are other variations between breakfast patties and links. Some links have a casing while patties do not, and patties are often more strongly flavored compared to the links.
-=======
-<<<<<<< HEAD
-# Homemade Sausages
-
-A sausage is a universally used ingredient... every nation has one they're proud of and we're going to show you our favourite banger! We apologise in advance for the mischief and awkward inappropriateness... but that aside... we promise the sausages are delicious.
-
-Source: https://sortedfood.com/recipe/2609
-
-## Ingredients
-
-- 800 g pork shoulder
-- 200 g pork belly
-- 1 glass red wine
-- 1 tsp mixed spice
-- 1 lemon, zested
-- 1 orange, zested
-- 1 knob(s) ginger, grated
-- 3 fresh sage leaves
-- 2 pinch(es) salt and pepper
-- 1 portion(s) pigs intestine, in salty brine
-
-## Instructions
-
-1. Reduce the glass of wine to syrup in a saucepan, keep going until you're left with about a shot glass amount. Grind the pork belly and shoulder in a machine to give you minced meat. (You can simply buy sausage meat from you butcher if you want to skip this stage.)
-2. Mix the minced meat with salt, pepper, zest of both citrus fruit, the grated ginger, chopped sage and red wine syrup.
-3. Thread the intestine onto the horn of the sausage machine and pull it right over the tip. Feed the flavoured sausage meat into machine and once it reaches the end of the horn pull the intestine back over the end and tie a knot.
-4. Fill the intestine evenly and equally, not forcing too much in, so you have one long sausage. Tie the end.
-5. Twist the string of sausage into 6 inch sausages, making sure each twist is in the opposite direction to the last.
-6. Prick the sausages all over and grill for a few minutes on each side. Makes a dozen.
-=======
 # Homemade Pork Breakfast Sausage
 
 In general, homemade is better than store-bought, and this spiced pork sausage is no exception. Taking a mere 15 minutes, and calling for just ground pork and pantry spices, this sausage mixture makes breakfast patties with a kick; if you want a milder sausage, feel free to leave out the cayenne and red pepper flakes or use a little less.
@@ -109,6 +37,5 @@ For a healthier version, substitute ground turkey meat for the pork, which will
 
 # Question
 Is There a Difference Between Breakfast Sausage Patties and Links?
-In addition to the differences in shape, there are other variations between breakfast patties and links. Some links have a casing while patties do not, and patties are often more strongly flavored compared to the links.
->>>>>>> 5e05efc2937aa54db810c2cac4bc6ec3c466cda2
->>>>>>> b6bd0fb162edaec0f7c82cf5177f8f61767cb00a
+
+In addition to the differences in shape, there are other variations between breakfast patties and links. Some links have a casing while patties do not, and patties are often more strongly flavored compared to the links.
\ No newline at end of file