diff --git a/css/popup.css b/css/popup.css
index 02dee18..4ac2663 100644
--- a/css/popup.css
+++ b/css/popup.css
@@ -45,6 +45,8 @@
     /*-webkit-box-shadow: 0px 0px 160px 0px rgba(80,80,80,1);
     -moz-box-shadow: 0px 0px 160px 0px rgba(80,80,80,1);
     box-shadow: 0px 0px 160px 0px rgba(80,80,80,1);*/
+<<<<<<< HEAD
+=======
     box-shadow: 0px 0px 5px 5px rgba(0,0,0,0.33);
     -webkit-box-shadow: 0px 0px 5px 5px rgba(0,0,0,0.33);
     -moz-box-shadow: 0px 0px 5px 5px rgba(0,0,0,0.33);
@@ -92,4 +94,5 @@
     top: 24px;
     height: 32px;
   }
+>>>>>>> 811a1691680c070c92096fa1cdc3a061d8745033
 }
diff --git a/posting2.js b/posting2.js
index 99fa7c5..a2b4652 100644
--- a/posting2.js
+++ b/posting2.js
@@ -6,6 +6,8 @@
     
     /* options: url: url to post, loading: dom id, success: func, pre_callback, separated_data:boolean, upload: {progressbar: '#progressbar', 'total_loader': '#total_loader', 'status': '#status'} */
     
+    $.fn.options={};
+    
 	$.fn.sendPost = function (options) 
 	{
 
@@ -23,6 +25,9 @@
             
         }
         
+<<<<<<< HEAD
+        this.options=options;
+=======
         var xhr=false;
         
         if(options.hasOwnProperty("upload")) {
@@ -57,8 +62,9 @@
                 return myXhr;
             }
         }
+>>>>>>> 811a1691680c070c92096fa1cdc3a061d8745033
         
-        $(this).on('submit', function (e) {
+        $(this).on('submit', {url: this.options.url}, function (e) {
 
             //Get data of form
             
@@ -98,8 +104,13 @@
             }
             
             //Ajax
+<<<<<<< HEAD
+            
+            $.ajax({
+=======
 
             ajax_post={
+>>>>>>> 811a1691680c070c92096fa1cdc3a061d8745033
                 type: "POST",
                 url: options.url,
                 data: data,
@@ -210,7 +221,9 @@
             return false;
             
         });
-
+        
+        return this;
+        
     }
 
 })( jQuery );