diff --git a/source/index.html b/source/index.html
index 8211528..8beabb9 100644
--- a/source/index.html
+++ b/source/index.html
@@ -7,6 +7,10 @@
     <script src="http://code.jquery.com/jquery-2.1.0.min.js"></script>
     <script src="bots.js"></script>
     <script src="srcbot.js"></script>
+<<<<<<< HEAD
+    
+=======
+>>>>>>> 817dc2d8bffd4b8b813ab98602c0100fa0df6c58
     <script>        
         $(function() {
             var input = $("input");
@@ -32,6 +36,52 @@
     </script>
     
     <style>
+<<<<<<< HEAD
+        body{
+            text-align: center;
+        }
+        div {
+            width:40%;
+            height:400px;
+            overflow:auto;
+            margin:auto;
+            padding-top:10px;
+	    font-size:16px;
+	    font-family:Segoe UI;
+	    border-radius:5px;
+	    border:none;
+	    box-shadow: 0 14px 28px rgba(0,0,0,0.25), 0 10px 10px rgba(0,0,0,0.22);
+	    padding:10px;
+        }
+        input {
+            width:40%;
+            margin:auto;
+            font-size:16px;
+	    font-family:Segoe UI;
+	    border-radius:50px;
+	    border:none;
+	    color:white;
+	    background-color:rgb(0,54,100);
+	    padding:10px;
+	    padding-right:20px;
+	    padding-left:20px;
+	    box-shadow: 0 14px 28px rgba(0,0,0,0.25), 0 10px 10px rgba(0,0,0,0.22);
+
+        }
+        button {
+            width:50px;
+            transition: all 0.3s cubic-bezier(.25,.8,.25,1);
+	font-size:17px;
+	font-family:Segoe UI;
+	margin:2px;
+	border-radius:2px;
+	border:none;
+	color:rgb(0,111,221);
+	font-weight:50;
+	background-color:rgb(228,228,228);
+	padding:10px;
+	box-shadow: 0 3px 6px rgba(0,0,0,0.16), 0 3px 6px rgba(0,0,0,0.23);}
+=======
         div {
             width:500px;
             height:500px;
@@ -44,6 +94,7 @@
         }
         button {
             width:50px;
+>>>>>>> 817dc2d8bffd4b8b813ab98602c0100fa0df6c58
         }
         p {
             margin:0;