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 6d6c57f9b7de458e39f7720c1d6593f98bee899a Mon Sep 17 00:00:00 2001
From: Chris Truong <chrisanhoi@hotmail.com>
Date: Thu, 30 Jun 2016 13:59:57 -0700
Subject: [PATCH 2/2] push merged branch master

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

diff --git a/cookie.rb b/cookie.rb
index d73c04a..6ba439d 100644
--- a/cookie.rb
+++ b/cookie.rb
@@ -9,5 +9,5 @@ def initialize(sugar, flour)
   def calorie_count
     @sugar * 3.87 + @flour * 3.64
   end
-
+random comment  sfsdfd
 end