From 50bc71ed41de4fcc348d46a549779a0505e8b662 Mon Sep 17 00:00:00 2001
From: larstvei <larstvei@student.matnat.uio.no>
Date: Sun, 15 Dec 2013 22:53:10 +0100
Subject: [PATCH] Updated README.md to fix merge conflict.

---
 README.md | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index fac3ad0..77cc3a6 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,7 @@
-#Etype
+etype
+=====
+
+A typing game for Emacs.
 
 Etype is a game written for Emacs, and is heavily inspired by
 [Z-Type](http://phoboslab.org/ztype/).