From faf39e069ad519046dd48ae0215d193fcaf4a40d Mon Sep 17 00:00:00 2001
From: mmk2410 <marcelmichaelkapfer@yahoo.co.nz>
Date: Wed, 18 Feb 2015 10:41:49 +0100
Subject: [PATCH] Updated Readme

---
 README.md | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/README.md b/README.md
index 5ab095d..2ee5a02 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,5 @@
 # Material Design
 
-<<<<<<< HEAD
 A writtenMorse and normal morse code converter for Android. You can find more information about this app on http://marcel-kapfer.de/projects/morse/.
 
 ## Contribute
@@ -16,15 +15,12 @@ You can also check out the issues and the Trello board.
 ## Trello Board
 
 [Feature & Development Board](https://trello.com/b/SGMIGVbI/morse-android)
-=======
-This is the branch where the material design is created
-
-## Progress
-
-At the moment the whole app is ready to publish but I will waite a few hours and search for bugs.
 
 ## Design
 
-This is how it will look like:
+This is how it looks:
 ![Image](http://marcel-kapfer.de/res/blog/20150218/with-background.png)
->>>>>>> material
+
+## Used Libraries
+
+[Neokree's Material Navigation Drawer](https://github.com/neokree/MaterialNavigationDrawer)