From 72613603e35b8cfcf5a3e7fcb238857d1f4be1d0 Mon Sep 17 00:00:00 2001
From: Tammam Kbeili <tammam.kbeili@gmail.com>
Date: Fri, 29 Apr 2016 06:31:02 -0700
Subject: [PATCH 1/3] add calorie_count method

---
 cookie.rb | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/cookie.rb b/cookie.rb
index 09cc19a..d73c04a 100644
--- a/cookie.rb
+++ b/cookie.rb
@@ -6,4 +6,8 @@ def initialize(sugar, flour)
     @sugar, @flour = sugar, flour
   end
 
+  def calorie_count
+    @sugar * 3.87 + @flour * 3.64
+  end
+
 end

From 932c9d4d5d46484c7861e03a3390c97b77d47fbf Mon Sep 17 00:00:00 2001
From: conceivably <David.Leehr@gmail.com>
Date: Thu, 30 Jun 2016 13:52:11 -0700
Subject: [PATCH 2/3] Update cookie.rb

---
 cookie.rb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/cookie.rb b/cookie.rb
index d73c04a..0ee21f4 100644
--- a/cookie.rb
+++ b/cookie.rb
@@ -11,3 +11,5 @@ def calorie_count
   end
 
 end
+
+#some change

From f37b6d8f21e032cc324492fe4cb5d908f950d4d4 Mon Sep 17 00:00:00 2001
From: david <David.Leehr@gmail.com>
Date: Thu, 30 Jun 2016 13:58:34 -0700
Subject: [PATCH 3/3] made a test change

---
 cookie.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/cookie.rb b/cookie.rb
index 0ee21f4..a9e008b 100644
--- a/cookie.rb
+++ b/cookie.rb
@@ -13,3 +13,4 @@ def calorie_count
 end
 
 #some change
+# Another change