Resolved conflict

index.html

@@ -83,9 +83,9 @@ <h1>stephband.info</h1>
     <h2>jquery.parallax</h2>
 
     <h3>Download</h3>
+<pre>git clone git://github.com/stephband/jparallax.git</pre>
     <ul>
-      <li><a href="js/jquery.parallax.js">jquery.parallax.min.js</a> <small>5KB MINIFIED | 2KB GZIPPED</small></li>
-      <li><a href="http://cloud.github.com/downloads/stephband/jparallax/jparallax-1.0.zip">jparallax-1.0.zip</a> <small>Zipped source, documentation and demos</small></li>
+      <li><a href="http://github.com/stephband/jparallax">github.com/stephband/jparallax</a></li>
     </ul>
 
     <h3>Instantiation</h3>
@@ -275,15 +275,15 @@ <h3>Tips</h3>
 
     <h4>Transparent image layers</h4>
     <p>Lots of transparency in images will slow down a browser's ability to render quickly.  Avoid making huge layers of semi-opaque graphics if you don't want lesser browsers to choke.</p>
-  
+
     <h3>Version history</h3>
     <p>See the <a href="changelog.html">changelog</a>.</p>
-    
+
     <h3>Bug reporting</h3>
     <p><a href="https://github.com/stephband/jparallax/issues">github.com/stephband/jparallax/issues</a></p>
 
-		<h3>Who made it?</h3>
-		<p>I did. I'm <a href="http://twitter.com/stephband">stephband</a> on twitter, if you're into that sort of thing.</p>
+    <h3>Who made it?</h3>
+    <p>I did. I'm <a href="http://twitter.com/stephband">stephband</a> on twitter, if you're into that sort of thing.</p>
   </div>
 
   <script src="http://ajax.googleapis.com/ajax/libs/jquery/1.7.2/jquery.js"></script>
@@ -298,4 +298,4 @@ <h3>Who made it?</h3>
   });
   </script>
 </body>
-</html>
+</html>