resolved local conflicts

js/speedtrans.js

@@ -3,16 +3,15 @@
 'use strict';
 
 (function() {
- 
     Ox.load({
         UI: {
-            theme: 'modern' //FIXME: get theme through localStorage
+//            theme: 'modern' //FIXME: get theme through localStorage
         }
     }, loadSpeedtrans);        
 
     function loadSpeedtrans(browserSupported) {
+        alert("hi");
         if (!browserSupported) { alert("your browser is not supported"); return; }
-        
         window.pandora = Ox.App({url: '/api/'}).bindEvent({
             'load': function(data) {
 //                console.log(data);