changes in index

diff --cc index.html
index 346a788,d84f13d..770b3cf
--- 1/index.html
--- 2/index.html
+++ b/index.html
@@@ -46,6 -46,6 +46,10 @@@
  
  <script src="js/app.js"></script>
  <script>if (window.module) module = window.module;</script>
++<<<<<<< HEAD
 +
++=======
+ <script src="renderer.js"></script>
++>>>>>>> a9365519985ea97014e0a4cf9a311126d1151e59
  </body>
  </html>

diff --cc js/app.js
index 7e53e99,a98e980..d534f87
--- 1/js/app.js
--- 2/js/app.js
+++ b/js/app.js
@@@ -6,15 -6,14 +6,15 @@@
  
  $( document ).ready(function() {
    console.log( "Main ready!" );
-   app.loadmodule("overview");
+   browserapp.loadmodule("overview");
    console.log("After module load!");
  });
 +
  console.log(navigator.platform);
  console.log(location.protocol);
- var app = {
+ var browserapp = {
  loadmodule: function(modulename){
-   var appdata = app.getconfig();
+   var appdata = browserapp.getconfig();
    var params = "?";
    for (var i in appdata){
      params += "&" + i +"=" + encodeURIComponent(appdata[i]);