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/2] 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 d4b7cc63848ecfdf7d73dd71741b206b5f188eec Mon Sep 17 00:00:00 2001
From: g k <gurbraj.kang@gmail.com>
Date: Fri, 29 Apr 2016 14:04:53 -0700
Subject: [PATCH 2/2] adding caloriecount

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

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