resolve merge conflict

Author: electron0zero

Readme.md

@@ -5,7 +5,7 @@
 ![Build Status](https://travis-ci.org/ProjectRecommend/Recommend.svg?branch=master)
 
 
-Recommend is a project that is trying to use clustering on metadata(ID3-tags)
+Recommend is a project that uses clustering on metadata(ID3-tags)
 of your music files to Recommend you similar songs from your Offline Music library
 
 #### Why ?
@@ -15,7 +15,7 @@ well we got bored and started a project on something that we like.
 all jokes aside, We thought it would be cool to use ID3 tags to find similarity
 in your offline music collection.
 
-This project is under heavy development
+This project is under development
 
 #### Demo
 
@@ -30,3 +30,12 @@ This project is under heavy development
 <img src="Screenshots/4.png" height="400">
 <img src="Screenshots/5.png" height="400">
 </p>
+[![Recommend - Demo Video](http://img.youtube.com/vi/xF9p5lDcmi4/0.jpg)](https://www.youtube.com/watch?v=xF9p5lDcmi4)
+
+#### Links
+
+[Website](https://projectrecommend.github.io/)
+
+[Docs](https://github.com/ProjectRecommend/docs)
+
+[Issue Tracker](https://github.com/ProjectRecommend/Recommend/issues)