From fc14a380c2c3c801531941c2d83f3425376550fa Mon Sep 17 00:00:00 2001
From: Claire Prouve <cp13959@eduroam-192-234.nomadic.bris.ac.uk>
Date: Fri, 13 Feb 2015 14:05:48 +0000
Subject: [PATCH] I ClaireProuve fixed issue #3

---
 README.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/README.md b/README.md
index a5591ba..6f89403 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,6 @@
 # git-tutorial
+<<<<<<< HEAD
 
 ## Participants
 @kreczko
+@ClaireProuve