From 3713bea54ae4d82e24e6a98c9152fca59f7e9890 Mon Sep 17 00:00:00 2001
From: tommorte <tomas@finn.no>
Date: Tue, 4 Sep 2012 13:02:17 +0200
Subject: [PATCH 1/7] Changed to a much better heading

---
 views/index.ejs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/views/index.ejs b/views/index.ejs
index a2fcced..956202d 100644
--- a/views/index.ejs
+++ b/views/index.ejs
@@ -7,7 +7,7 @@
   <body>
     <h1>
       <img src="hellocthulhu-right.png">
-      HELLO FINN
+      HELLO FINN - TOMAS
       <img src="hellocthulhu-left.png">
     </h1>
     <ul>

From 359af8a534997242b01cde2ecb6b9583751b2947 Mon Sep 17 00:00:00 2001
From: tommorte <tomas@finn.no>
Date: Tue, 4 Sep 2012 13:27:07 +0200
Subject: [PATCH 2/7] Hello Kitty!

---
 views/index.ejs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/views/index.ejs b/views/index.ejs
index 956202d..5d1bbe3 100644
--- a/views/index.ejs
+++ b/views/index.ejs
@@ -7,7 +7,7 @@
   <body>
     <h1>
       <img src="hellocthulhu-right.png">
-      HELLO FINN - TOMAS
+      HELLO FINN - HELLO KITTY
       <img src="hellocthulhu-left.png">
     </h1>
     <ul>

From 86e962f9eb96ecdfc7b7d07ff29263a01277a25d Mon Sep 17 00:00:00 2001
From: tommorte <tomas@finn.no>
Date: Tue, 4 Sep 2012 13:35:11 +0200
Subject: [PATCH 3/7] another branch

---
 views/index.ejs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/views/index.ejs b/views/index.ejs
index 5d1bbe3..8bdd56b 100644
--- a/views/index.ejs
+++ b/views/index.ejs
@@ -7,7 +7,7 @@
   <body>
     <h1>
       <img src="hellocthulhu-right.png">
-      HELLO FINN - HELLO KITTY
+      HELLO FINN - another branch
       <img src="hellocthulhu-left.png">
     </h1>
     <ul>

From 940348d0d3b346a9f0c05ea9cd0e3e028e58f532 Mon Sep 17 00:00:00 2001
From: tommorte <tomas@finn.no>
Date: Tue, 4 Sep 2012 13:35:57 +0200
Subject: [PATCH 4/7] Still at master

---
 views/index.ejs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/views/index.ejs b/views/index.ejs
index 5d1bbe3..2b2674e 100644
--- a/views/index.ejs
+++ b/views/index.ejs
@@ -7,7 +7,7 @@
   <body>
     <h1>
       <img src="hellocthulhu-right.png">
-      HELLO FINN - HELLO KITTY
+      HELLO FINN - Still on master
       <img src="hellocthulhu-left.png">
     </h1>
     <ul>

From e1e9f1ec4ba25547e8bfa8ca493e30082afa3e32 Mon Sep 17 00:00:00 2001
From: tommorte <tomas@finn.no>
Date: Tue, 4 Sep 2012 13:39:32 +0200
Subject: [PATCH 5/7] yet another branch

---
 views/index.ejs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/views/index.ejs b/views/index.ejs
index 8bdd56b..7b4ad32 100644
--- a/views/index.ejs
+++ b/views/index.ejs
@@ -7,7 +7,7 @@
   <body>
     <h1>
       <img src="hellocthulhu-right.png">
-      HELLO FINN - another branch
+      HELLO FINN - yet another branch
       <img src="hellocthulhu-left.png">
     </h1>
     <ul>

From 9e4ca686c24aec1664cb6251aec3bb8954f63028 Mon Sep 17 00:00:00 2001
From: tommorte <tomas@finn.no>
Date: Tue, 4 Sep 2012 13:56:26 +0200
Subject: [PATCH 6/7] still on master

---
 views/index.ejs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/views/index.ejs b/views/index.ejs
index 8bdd56b..d1d6c9e 100644
--- a/views/index.ejs
+++ b/views/index.ejs
@@ -7,7 +7,7 @@
   <body>
     <h1>
       <img src="hellocthulhu-right.png">
-      HELLO FINN - another branch
+      HELLO FINN - still on master
       <img src="hellocthulhu-left.png">
     </h1>
     <ul>

From 2721d22adaf50cd5504d7bed31fa330377e922f0 Mon Sep 17 00:00:00 2001
From: tommorte <tomas@finn.no>
Date: Tue, 4 Sep 2012 14:37:54 +0200
Subject: [PATCH 7/7] tomas

---
 views/index.ejs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/views/index.ejs b/views/index.ejs
index 359e5e7..86cabcc 100644
--- a/views/index.ejs
+++ b/views/index.ejs
@@ -2,12 +2,13 @@
 <html>
   <head>
     <title>My Little Todo List</title>
+     <script type="text/javascript" src="http://code.jquery.com/jquery.js"></script>
     <link rel="stylesheet" href="screen.css">
   </head>
   <body>
     <h1>
       <img src="hellocthulhu-right.png">
-      HELLO FINN - still on master - resolved merge conflict
+      HELLO FINN - tomas
       <img src="hellocthulhu-left.png">
     </h1>
     <ul>
