Update README.md

artyprog · web-flow · commit 7380417b409e · 2016-07-02T15:11:01.000+02:00
diff --git a/README.md b/README.md
@@ -1,8 +1,5 @@
-<<<<<<< HEAD
-# GFK-DEV 
-=======
+
 # GFK  
->>>>>>> master
 
 Games for Kids written with [Hexi](https://github.com/kittykatattack/hexi) and [Transcrypt](http://transcrypt.org/)  
 
