diff --git a/docs/list.js b/docs/list.js
index 838aeb9b030baa82b2749c4a35f738495c759e65..731b620fe4639e9204eef70d2927ce3476428b48 100644
--- a/docs/list.js
+++ b/docs/list.js
@@ -3,10 +3,8 @@ var list = {
 	"Manual": {
 		"Introduction": [
 			[ "Creating a scene", "manual/introduction/Creating-a-scene" ],
-<<<<<<< HEAD
 			[ "Matrix transformations", "manual/introduction/Matrix-transformations" ],
-			[ "Useful links", "manual/introduction/Useful-links" ]
-=======
+			[ "Useful links", "manual/introduction/Useful-links" ],
 			[ "Drawing Lines", "manual/introduction/Drawing-lines" ],
 			[ "Creating Text", "manual/introduction/Creating-text" ],
 			[ "Code Style Guide", "manual/introduction/Code-style-guide" ],
@@ -16,7 +14,6 @@ var list = {
 
 		"Build Tools": [
 			[ "Testing with NPM", "manual/buildTools/Testing-with-NPM" ]
->>>>>>> 56ec5ce2e269d9fdf08ce6b385813c6ce0dc10ed
 		]
 	},
 
diff --git a/docs/manual/introduction/Useful-links.html b/docs/manual/introduction/Useful-links.html
index 62bcf564ba2049431954c78466c03dfa99f6009c..8df08b0182ff7c1d26b03def5ace604169051d04 100644
--- a/docs/manual/introduction/Useful-links.html
+++ b/docs/manual/introduction/Useful-links.html
@@ -20,41 +20,140 @@
 			check the browser console for warning, the relevant docs pages and especially the [page:DeprecatedList].
 		</div>
 
-    <h2>Presentations</h2>
+		<h2>More documentation</h2>
+		<ul>
+			<li>
+				[link:http://threejsdoc.appspot.com/doc/index.html threejsdoc] - useful because it links every API element to to every official example that uses it.
+			</li>
+			<li>
+				[link:http://ushiroad.com/3j/ Three.js walking map] - a graphical breakdown of the structure of a three.js scene.
+			</li>
+			<li>
+				[link:http://www.reddit.com/r/threejs/ Three.js] subreddit.
+			</li>
+			<li>
+				[link:http://www.reddit.com/r/webgl/ WebGL] subreddit.
+			</li>
+		</ul>
 
-		<h3>[link:https://www.youtube.com/watch?v=Dir4KO9RdhM AlterQualia at WebGL Camp 3]</h3>
-		<div>
-			A video presentation from 2012 by AlteredQualia, one of the main developers of three.js.
-		</div>
+		<h2>News and Updates</h2>
+		<ul>
+			<li>
+				[link:http://learningwebgl.com/blog/ Learning WebGL Blog] – The authoritaive news source for WebGL.
+			</li>
+			<li>
+				[link:https://plus.google.com/104300307601542851567/posts Three.js posts] on Google+ – frequent posts on Three.js
+			</li>
+		</ul>
+
+		<h2>Articles</h2>
+		<ul>
+			<li>
+				[link:http://bkcore.com/blog/3d/webgl-three-js-animated-selective-glow.html Animated selective glow in Three.js]
+				by [link:https://github.com/BKcore BKcore]
+			</li>
+			<li>
+
+			</li>
+			<li>
+
+			</li>
+			<li>
+
+			</li>
+		</ul>
 
 		<h2>Examples</h2>
+		<ul>
+			<li>
+				[link:http://stemkoski.github.io/Three.js/index.html Professor Stemkoskis Examples] - a collection of beginner friendly
+				examples built using three.js r60.
+			</li>
+			<li>
+				[link:https://threejs.org/examples/ Official three.js Examples] - these examples are
+				maintained as part of the three.js repository, and always use the latest version of three.js.
+			</li>
+			<li>
+				[link:https://rawgit.com/mrdoob/three.js/dev/examples/ Official three.js Examples] (dev branch) -
+				Same as the above, except these use the dev branch of three.js,	and are used to check that
+				everything is working as three.js being is developed.
+			</li>
+		</ul>
 
-		<h3>[link:http://stemkoski.github.io/Three.js/index.html Professor Stemkoskis Examples]</h3>
-		<div>
-			Even though Dr. Lee Stemkoski's examples are built using r60, they are very beginner
-			friendly and contain a lot of useful info.
-			Just be warned that some of them might be a bit out of date now!
-		</div>
+	 <h2>Tools</h2>
+	 <ul>
+		 <li>
+			[link:http://www.physgl.org/ physgl.org] - javascript front-end with wrappers to three.js, to bring WebGL
+ 			graphics to students learning physics and math.
+		 </li>
+		 <li>
+			 [link:http://whitestormjs.xyz/ Whitestorm.js] – A wrapper around Three.js and custom [link:https://github.com/chandlerprall/Physijs physi.js].
+		 </li>
 
-		<h3>[link:http://yomotsu.github.io/threejs-examples/ Yomotsus Examples]</h3>
-		<div>
-			Again, these are built with an old version of three.js (r49), so the same warnings as above apply:
-			be warned that you might have to make some changes to use the techniques in these examples.
-	 </div>
+		<li>
+			[link:http://zz85.github.io/zz85-bookmarklets/threelabs.html Three.js Inspector]
+		</li>
+		<li>
+			[link:http://idflood.github.io/ThreeNodes.js/ ThreeNodes.js].
+		</li>
+	 </ul>
 
-	 <h3>[link:https://threejs.org/examples/ Official three.js Examples]</h3>
-	 <div>
-		 A large number of examples are maintained as part of the three.js repository. They are kept up to
-		 date and always use the latest version.
-	   It's probably best to work off these examples than the ones linked above, however some of them may
-		 not be quite as beginner friendly.
-	 </div>
+	 <h2>Tutorials and courses</h2>
+	 <ul>
+		 <li>
+			 [link:https://www.udacity.com/course/cs291 Interactive 3D Graphics] - a free course on Udacity that teaches the fundamentals of 3D Graphics,
+			 and uses three.js as it coding tool.
+		 </li>
+		 <li>
+			[Link:https://aerotwist.com/tutorials/ Aerotwist] tutorials by [link:https://github.com/paullewis/ Paul Lewis].
+		 </li>
+		 <li>
+			 [link:http://www.natural-science.or.jp/article/20120220155529.php Building A Physics Simulation Environment] - three.js tutorial in Japanese
+		 </li>
+		 <li>
+			 [link:http://www.senaeh.de/einstieg-in-webgl-mit-three-js/ Einstieg in WebGL mit three.js] - three.js tutorial in German
+		 </li>
+		 <li>
+			 [link:http://learningthreejs.com/ Learning Three.js] – blog where each post is dedicated to teaching an aspect of three.js
+		 </li>
+	 </ul>
 
-	 <h3>[link:https://rawgit.com/mrdoob/three.js/dev/examples/ Official three.js Examples] (dev branch) </h3>
+	 <h2>Old Links</h2>
 	 <div>
-		 Same as the above, except these use the dev branch of three.js,
-		 and are used to check that everything is working as three.js being is developed.
+		These links are kept for historical purposes - you may still find them useful, but be warned that
+		they may have information relating to very old versions of three.js.
 	 </div>
 
+	 <ul>
+		<li>
+			<a href="https://www.youtube.com/watch?v=Dir4KO9RdhM">AlterQualia at WebGL Camp 3</a>
+		</li>
+		<li>
+			[link:http://yomotsu.github.io/threejs-examples/ Yomotsus Examples] - a collection of examples using three.js r45.
+		</li>
+		<li>
+			[link:http://fhtr.org/BasicsOfThreeJS/#1 Introduction to Three.js] by [link:http://github.com/kig/ Ilmari Heikkinen] (slideshow).
+		</li>
+		<li>
+			[link:http://www.slideshare.net/yomotsu/webgl-and-threejs WebGL and Three.js] by [link:http://github.com/yomotsu Akihiro Oyamada] (slideshow).
+		</li>
+		<li>
+			[link:http://bkcore.com/blog/general/adobe-user-group-nl-talk-video-hexgl.html Fast HTML5 game development using three.js] by [link:https://github.com/BKcore BKcore] (video).
+		</li>
+		<li>
+			<a href="http://www.youtube.com/watch?v=VdQnOaolrPA">Trigger Rally</a>  by [link:https://github.com/jareiko jareiko] (video).
+		</li>
+		<li>
+			[link:http://blackjk3.github.io/threefab/ ThreeFab] - scene editor, maintained up until around three.js r50.
+		</li>
+		<li>
+			[link:http://bkcore.com/blog/3d/webgl-three-js-workflow-tips.html Max to Three.js workflow tips and tricks] by https://github.com/BKcore BKcore]
+		</li>
+		<li>
+			[link:http://12devsofxmas.co.uk/2012/01/webgl-and-three-js/ On the twelfth day of Xmas, take a whirlwind look at Three.js]
+			by [link:http://github.com/nrocy Paul King]
+		</li>
+	 </ul>
+
 	</body>
 </html>