From 2d0c4c0f9e8b1b7ae1bbcac7357b615710e51f8c Mon Sep 17 00:00:00 2001
From: Nicolas Bornand <nicolas74@gmail.com>
Date: Sun, 11 May 2014 11:09:57 +0200
Subject: Merge origin/master

Conflicts:
	app/js/services.js
---
 app/js/services.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/js/services.js b/app/js/services.js
index 79d4c40..f40188d 100644
--- a/app/js/services.js
+++ b/app/js/services.js
@@ -34,7 +34,7 @@ app.service('pathService', function() {
             var selection = [];
             var tuning = .5;
             angular.forEach(songListCopy, function(song){
-                song.rand = /*(tuning + tuning*Math.random())*/song.minDist;
+                song.rand = (tuning + tuning*Math.random())*song.minDist;
             });
             songListCopy.sort(function(a,b){return a.rand-b.rand;});
             //take from the sorted list util we reach the desired duration
-- 
cgit v1.2.3