Merge branch 'master' of https://github.com/Seavenois/ObJS

README.md

@@ -8,7 +8,11 @@ ObJS
 
 ### Live demo ###
 
-<a href="http://seavenois.com/jstricks/ObJS/">http://seavenois.com/jstricks/ObJS/</a>
+<<<<<<< HEAD
+<a href="om/jstricks/ObJS/">http://seavenois.com/jstricks/ObJS/</a>
+=======
+<a href="http://inigovalentin.com/3dview/resource/Bookshelf">http://inigovalentin.com/3dview/resource/Bookshelf</a>
+>>>>>>> 28ef4e483d70089a4983965f59082af9d74d6a7b
 
 
 
@@ -164,4 +168,4 @@ myObJS.setMovementSpeed(value);
 ```javascript
 myObJS.setZoomSpeed(value);
 ```
-* *value* is an integer, between 0 and 10. The greater it is, the greater the zoom speed.
+* *value* is an integer, between 0 and 10. The greater it is, the greater the zoom speed.

script/ObJS.js

@@ -247,7 +247,6 @@ function ObJS(){
 	this.isMaterialUsed = function(){
 		return useMtl;
 	};
-	
 	/********************************************************************
 	 * Getters that determine if the model has associated materials.    *
 	 ********************************************************************/