Merge branch 'master' of https://github.com/imnpandey/medium-clone

README.md

@@ -1,15 +1,10 @@
-<<<<<<< HEAD
 # Medium-Clone
 
 This is a clone/copy of [medium.com](https://medium.com).
-=======
-<h1>Medium-Clone</h1>
->>>>>>> b29cf5e6211f5f1672601ef26413bb9fa4c76034
 
-This is a clone/copy of medium.com
 It gives the medium's some functionality in dirty way.
 
-<<<<<<< HEAD
+
 __demo__: [http://blog.iteching.info](http://blog.iteching.info)
 
 ## Features
@@ -24,39 +19,18 @@ __Inline Editor:__ https://github.com/daviferreira/medium-editor
 __Placeholder:__ https://github.com/sprucemedia/jQuery.divPlaceholder.js
 
 ![screenshot](https://raw.github.com/imnpandey/medium-clone/master/demo-images/new-post.jpg)
-![screenshot](https://raw.github.com/imnpandey/medium-clone/master/demo-images/new-post-placeholder.jpg)
-=======
-
-<b>Demo:</b> http://blog.iteching.info
-
-
-<h4>The repos used:</h4>
-<b>Inline Editor:</b> https://github.com/daviferreira/medium-editor
-
-<b>Placeholder:</b> https://github.com/sprucemedia/jQuery.divPlaceholder.js
-
-<b>Design:</b> Copied from Medium (to save time)
->>>>>>> b29cf5e6211f5f1672601ef26413bb9fa4c76034
+![screenshot](https://raw.github.com/imnpandey/medium-clone/master/demo-images/new-post-palceholder.jpg)
 
 __Design:__ Copied from Medium (to save time)
 __Time__ into project I guess its around 24 - 48 hrs mainly took time to copy the design.
 
-<<<<<<< HEAD
+
 ## Some More
-=======
-<b>Time</b> into project I guess its around 24 - 48 hrs mainly took time to copy the design.
->>>>>>> b29cf5e6211f5f1672601ef26413bb9fa4c76034
 
 ![screenshot](https://raw.github.com/imnpandey/medium-clone/master/demo-images/profile.jpg)
 ![screenshot](https://raw.github.com/imnpandey/medium-clone/master/demo-images/profile-edit.jpg)
 
-<<<<<<< HEAD
 ## License
 
-Do what you want to do!
-=======
-<h4>License</h4>
-
 Do what you want to do!<br>
 Fork/ Download have fun.<br>
->>>>>>> b29cf5e6211f5f1672601ef26413bb9fa4c76034