diff --git a/.gitignore b/.gitignore
index 5111752..5a61642 100644
--- a/.gitignore
+++ b/.gitignore
@@ -47,12 +47,11 @@ parabotv2/src/META-INF/MANIFEST.MF
 
 .idea/uiDesigner.xml
 
-<<<<<<< HEAD
 .idea/libraries/jfxrt.xml
-=======
 *.jar
 
 *.classpath
 
 *.project
->>>>>>> 18cffe02674768c9927a96cc05d2ae09e803974d
+
+*.xml
diff --git a/parabotv2/src/org/parabot/core/proxy/Proxy.java b/parabotv2/src/org/parabot/core/proxy/Proxy.java
new file mode 100644
index 0000000..b6499d3
--- /dev/null
+++ b/parabotv2/src/org/parabot/core/proxy/Proxy.java
@@ -0,0 +1,28 @@
+package org.parabot.core.proxy;
+
+import socks.Socks4Proxy;
+import socks.Socks5Proxy;
+
+import java.net.UnknownHostException;
+
+/**
+ * User: Jeroen
+ * Date: 18/02/14
+ * Time: 16:54
+ */
+public class Proxy {
+    public static Socks5Proxy proxy5;
+    public static Socks4Proxy proxy4;
+
+    public static void setProxy4() throws UnknownHostException {
+
+    }
+
+    public static void setProxy5() throws UnknownHostException {
+        proxy5 = new Socks5Proxy("80.63.56.146", 1080);
+    }
+
+    public static void main(String[] args) throws UnknownHostException {
+        setProxy5();
+    }
+}