diff --git a/public/cache.manifest b/public/cache.manifest
index 4f7362db..172b3b93 100644
--- a/public/cache.manifest
+++ b/public/cache.manifest
@@ -1,9 +1,5 @@
 CACHE MANIFEST
-<<<<<<< HEAD
-#Date Thu Dec 05 2013 00:36:35
-=======
-#Date Tue Dec 03 2013 00:27:53
->>>>>>> dd07077616dde78c6dc19f22e39ea98f05575656
+#Date Thu Dec 05 2013 00:42:44
 
 CACHE:
 res/worker.js
@@ -419,4 +415,4 @@ libs/MathJax/jax/output/HTML-CSS/fonts/STIX/fontdata.js
 #DynamicResourcesEnd
 
 NETWORK:
-*
\ No newline at end of file
+*
diff --git a/public/res-min/main.js b/public/res-min/main.js
index ee6124da..34d8de88 100644
--- a/public/res-min/main.js
+++ b/public/res-min/main.js
@@ -20493,8 +20493,8 @@ function() {
  }, r.onReady = function() {
   i = e(document.body), o = e('<div class="hide">'), e(".working-indicator").append(o);
   for (var t = 0; 3 > t; t++) o.append(e('<div class="bar">').css({
-   "animation-delay": (2 * t / 10).toPrecision(3) + "s",
-   "-webkit-animation-delay": (2 * t / 10).toPrecision(3) + "s"
+   "animation-delay": (15 * t / 10).toPrecision(3) + "s",
+   "-webkit-animation-delay": (15 * t / 10).toPrecision(3) + "s"
   }));
  }, r;
 }), function(e) {
diff --git a/public/res/extensions/workingIndicator.js b/public/res/extensions/workingIndicator.js
index 94abd60b..4af87b88 100644
--- a/public/res/extensions/workingIndicator.js
+++ b/public/res/extensions/workingIndicator.js
@@ -19,8 +19,8 @@ define([
         $('.working-indicator').append($workingIndicatorElt);
         for (var i = 0; i < 3; i++) {
             $workingIndicatorElt.append($('<div class="bar">').css({
-                'animation-delay': (i*2/10).toPrecision(3) + 's',
-                '-webkit-animation-delay': (i*2/10).toPrecision(3) + 's',
+                'animation-delay': (i*15/10).toPrecision(3) + 's',
+                '-webkit-animation-delay': (i*15/10).toPrecision(3) + 's',
             }));
         }
     };