Resolving README copy

README.md

@@ -1,5 +1,4 @@
 # [Instagram Infinite Scroll](http://ddknoll.github.io/Instagram-Infinite-Scroll/)
-<<<<<<< HEAD
 
 [Demo](http://ddknoll.github.io/Instagram-Infinite-Scroll/)
 
@@ -34,6 +33,7 @@ Sample Usage:
       complete: infiniteScrollBinding
     });
 
+
 Function Reference
 
     insta.load('replace'); // Replace the current data (Reload)
@@ -47,48 +47,3 @@ TODO:
 
 1. Minify JS
 2. Finish Documentation
-=======
-
-[Demo](http://ddknoll.github.io/Instagram-Infinite-Scroll/)
-
-Instagram Infinite Feed
-
-Sample Usage:
-
-    //Load a Ractive Template
-    $.get( 'templates/twitter-feed.rac').then( function ( template ) {
-      //Create New Instagram Feed
-      insta = new instagramFeed({
-        el: 'template-target',
-        template: template,
-        clientID: 'Your Instagram Client ID',
-        hashtag: 'webdesign',
-        complete: function(){
-            //Infinite Scroll Window Bindings
-            $(window).scroll(function(evt){
-              var bod = $('body')[0];
-              pageHeight = bod.offsetHeight;
-              bottomScroll = window.scrollY + bod.clientHeight;
-              if(pageHeight - bottomScroll < 200){
-                  insta.load('after');
-              }
-            });
-        }
-      });
-    });
-
-Function Reference
-
-    insta.load('replace'); // Replace the current data (Reload)
-    insta.load('before');  // Check for newer posts
-    insta.load('after');   // Load Older Posts
-    insta.set('hashtag', 'yolo'); //New Hashtag
-
-
-TODO:
-
-1. Minify JS
-2. Finish Documentation
-
-
->>>>>>> d198cb6315668e75fdb54d3a37e54638e009aba1