diff --git a/assets/js/color.js b/assets/js/color.js
index 0058daf..64d440d 100755
--- a/assets/js/color.js
+++ b/assets/js/color.js
@@ -1,4 +1,4 @@
-<<<<<<< HEAD
+
 $(document).ready(function(){
   $('.outline-color' ).each(function(index) {
     var color = "000000".replace(/0/g,function(){return (~~(Math.random()*16)).toString(16);});
@@ -7,115 +7,4 @@ $(document).ready(function(){
     var targetDiv = document.getElementsByClassName("colorlabel")[index];
     targetDiv.innerHTML = "#" + color;
   });
-=======
-
-
-
-
-
-var randomColor = "000000".replace(/0/g,function(){return (~~(Math.random()*16)).toString(16);});
-var randomColor1 = "000000".replace(/0/g,function(){return (~~(Math.random()*16)).toString(16);});
-var randomColor2 = "000000".replace(/0/g,function(){return (~~(Math.random()*16)).toString(16);});
-var randomColor3 = "000000".replace(/0/g,function(){return (~~(Math.random()*16)).toString(16);});
-var randomColor4 = "000000".replace(/0/g,function(){return (~~(Math.random()*16)).toString(16);});
-var randomColor5 = "000000".replace(/0/g,function(){return (~~(Math.random()*16)).toString(16);});
-var randomColor6 = "000000".replace(/0/g,function(){return (~~(Math.random()*16)).toString(16);});
-var randomColor7 = "000000".replace(/0/g,function(){return (~~(Math.random()*16)).toString(16);});
-
-var randomColor8 = "000000".replace(/0/g,function(){return (~~(Math.random()*16)).toString(16);});
-var randomColor9 = "000000".replace(/0/g,function(){return (~~(Math.random()*16)).toString(16);});
-var randomColor10 = "000000".replace(/0/g,function(){return (~~(Math.random()*16)).toString(16);});
-var randomColor11 = "000000".replace(/0/g,function(){return (~~(Math.random()*16)).toString(16);});
-var randomColor12 = "000000".replace(/0/g,function(){return (~~(Math.random()*16)).toString(16);});
- var randomColor13 = "000000".replace(/0/g,function(){return (~~(Math.random()*16)).toString(16);});
- var randomColor14 = "000000".replace(/0/g,function(){return (~~(Math.random()*16)).toString(16);});
- var randomColor15 = "000000".replace(/0/g,function(){return (~~(Math.random()*16)).toString(16);});
-
-$(function() {
-
-$("#colorbox").css({
-    backgroundColor:'#' + randomColor
-});
-$("#colorcode").text("#" + randomColor);
-
-$("#colorbox1").css({
-  backgroundColor:'#' + randomColor1
-});
-$("#colorcode1").text("#" + randomColor1);
-
-$("#colorbox2").css({
-  backgroundColor:'#' + randomColor2
-});
-$("#colorcode2").text("#" + randomColor2);
-
-$("#colorbox3").css({
-  backgroundColor:'#' + randomColor3
-});
-$("#colorcode3").text("#" + randomColor3);
-
-$("#colorbox4").css({
-    backgroundColor:'#' + randomColor4
-});
-$("#colorcode4").text("#" + randomColor4);
-
-$("#colorbox5").css({
-  backgroundColor:'#' + randomColor5
-});
-$("#colorcode5").text("#" + randomColor5);
-
-$("#colorbox6").css({
-  backgroundColor:'#' + randomColor6
-});
-$("#colorcode6").text("#" + randomColor6);
-
-$("#colorbox7").css({
-  backgroundColor:'#' + randomColor7
-});
-$("#colorcode7").text("#" + randomColor7);
-
-});
-
-$(function() {
-$("#colorbox8").css({
-    backgroundColor:'#' + randomColor8
-});
-$("#colorcode8").text("#" + randomColor8);
-
-$("#colorbox9").css({
-  backgroundColor:'#' + randomColor9
-});
-$("#colorcode9").text("#" + randomColor9);
-
-$("#colorbox10").css({
-  backgroundColor:'#' + randomColor10
-});
-$("#colorcode10").text("#" + randomColor10);
-
-$("#colorbox11").css({
-  backgroundColor:'#' + randomColor11
-});
-$("#colorcode11").text("#" + randomColor11);
-
-$("#colorbox12").css({
-    backgroundColor:'#' + randomColor12
-});
-$("#colorcode12").text("#" + randomColor12);
-
-$("#colorbox13").css({
-  backgroundColor:'#' + randomColor13
-});
-$("#colorcode13").text("#" + randomColor13);
-
-$("#colorbox14").css({
-  backgroundColor:'#' + randomColor14
-});
-$("#colorcode14").text("#" + randomColor14);
-
-
-$("#colorbox15").css({
-  backgroundColor:'#' + randomColor15
-});
-$("#colorcode15").text("#" + randomColor15);
-
->>>>>>> 3b8d586f83e00f953e7691702f949f462e836bdc
 });
diff --git a/index.html b/index.html
index 610d7d1..b623761 100755
--- a/index.html
+++ b/index.html
@@ -10,15 +10,10 @@
     <script src="https://use.fontawesome.com/8c528a6723.js"></script>
     <script src="assets/js/color.js"></script>
     <script src="assets/js/widget.js"></script>
-<<<<<<< HEAD
-    <script async defer src="https://buttons.github.io/buttons.js"></script>
-  </head>
-=======
 
     <script async defer src="https://buttons.github.io/buttons.js"></script>
   </head>
 
->>>>>>> 3b8d586f83e00f953e7691702f949f462e836bdc
   <body>
     <main id="#top">
       <header>
@@ -38,196 +33,113 @@
           <h1>Totally randomly generated colours</h1>
     </div>
   </div>
-<<<<<<< HEAD
   <div class="row">
+       <div class="three columns">
+         <div class="outline-color">
+           <div class="color"></div>
+           <p class="colorlabel"></p>
+         </div>
+      </div>
+      <div class="three columns">
+        <div class="outline-color">
+          <div class="color"></div>
+          <p class="colorlabel"></p>
+        </div>
+     </div>
      <div class="three columns">
        <div class="outline-color">
          <div class="color"></div>
          <p class="colorlabel"></p>
-=======
-
-  <div class="row">
-     <div class="three columns">
-       <div class="outline-color">
-         <div class="color" id="colorbox"></div>
-         <p class="colorlabel" id="colorcode"></p>
->>>>>>> 3b8d586f83e00f953e7691702f949f462e836bdc
        </div>
     </div>
     <div class="three columns">
       <div class="outline-color">
-<<<<<<< HEAD
         <div class="color"></div>
         <p class="colorlabel"></p>
-=======
-        <div class="color" id="colorbox1"></div>
-        <p class="colorlabel" id="colorcode1"></p>
->>>>>>> 3b8d586f83e00f953e7691702f949f462e836bdc
       </div>
    </div>
-   <div class="three columns">
-     <div class="outline-color">
-<<<<<<< HEAD
-       <div class="color"></div>
-       <p class="colorlabel"></p>
-=======
-       <div class="color" id="colorbox2"></div>
-       <p class="colorlabel" id="colorcode2"></p>
->>>>>>> 3b8d586f83e00f953e7691702f949f462e836bdc
-     </div>
   </div>
-  <div class="three columns">
-    <div class="outline-color">
-<<<<<<< HEAD
-      <div class="color"></div>
-      <p class="colorlabel"></p>
-=======
-      <div class="color" id="colorbox3"></div>
-      <p class="colorlabel" id="colorcode3"></p>
->>>>>>> 3b8d586f83e00f953e7691702f949f462e836bdc
-    </div>
- </div>
-</div>
-<div class="row">
-   <div class="three columns">
-     <div class="outline-color">
-<<<<<<< HEAD
-       <div class="color"></div>
-       <p class="colorlabel"></p>
-=======
-       <div class="color" id="colorbox4"></div>
-       <p class="colorlabel" id="colorcode4"></p>
->>>>>>> 3b8d586f83e00f953e7691702f949f462e836bdc
+
+  <div class="row">
+       <div class="three columns">
+         <div class="outline-color">
+           <div class="color"></div>
+           <p class="colorlabel"></p>
+         </div>
+      </div>
+      <div class="three columns">
+        <div class="outline-color">
+          <div class="color"></div>
+          <p class="colorlabel"></p>
+        </div>
      </div>
-  </div>
-  <div class="three columns">
-    <div class="outline-color">
-<<<<<<< HEAD
-      <div class="color"></div>
-      <p class="colorlabel"></p>
-=======
-      <div class="color" id="colorbox5"></div>
-      <p class="colorlabel" id="colorcode5"></p>
->>>>>>> 3b8d586f83e00f953e7691702f949f462e836bdc
+     <div class="three columns">
+       <div class="outline-color">
+         <div class="color"></div>
+         <p class="colorlabel"></p>
+       </div>
     </div>
- </div>
- <div class="three columns">
-   <div class="outline-color">
-<<<<<<< HEAD
-     <div class="color" ></div>
-     <p class="colorlabel"></p>
-=======
-     <div class="color" id="colorbox6"></div>
-     <p class="colorlabel" id="colorcode6"></p>
->>>>>>> 3b8d586f83e00f953e7691702f949f462e836bdc
+    <div class="three columns">
+      <div class="outline-color">
+        <div class="color"></div>
+        <p class="colorlabel"></p>
+      </div>
    </div>
-</div>
-<div class="three columns">
-  <div class="outline-color">
-<<<<<<< HEAD
-    <div class="color" ></div>
-    <p class="colorlabel"></p>
-=======
-    <div class="color" id="colorbox7"></div>
-    <p class="colorlabel" id="colorcode7"></p>
->>>>>>> 3b8d586f83e00f953e7691702f949f462e836bdc
   </div>
-</div>
-</div>
 
-<div class="row">
-   <div class="three columns">
-     <div class="outline-color">
-<<<<<<< HEAD
-       <div class="color"></div>
-       <p class="colorlabel"></p>
-=======
-       <div class="color" id="colorbox8"></div>
-       <p class="colorlabel" id="colorcode8"></p>
->>>>>>> 3b8d586f83e00f953e7691702f949f462e836bdc
+  <div class="row">
+       <div class="three columns">
+         <div class="outline-color">
+           <div class="color"></div>
+           <p class="colorlabel"></p>
+         </div>
+      </div>
+      <div class="three columns">
+        <div class="outline-color">
+          <div class="color"></div>
+          <p class="colorlabel"></p>
+        </div>
      </div>
-  </div>
-  <div class="three columns">
-    <div class="outline-color">
-<<<<<<< HEAD
-      <div class="color"></div>
-      <p class="colorlabel" ></p>
-=======
-      <div class="color" id="colorbox9"></div>
-      <p class="colorlabel" id="colorcode9"></p>
->>>>>>> 3b8d586f83e00f953e7691702f949f462e836bdc
+     <div class="three columns">
+       <div class="outline-color">
+         <div class="color"></div>
+         <p class="colorlabel"></p>
+       </div>
     </div>
- </div>
- <div class="three columns">
-   <div class="outline-color">
-<<<<<<< HEAD
-     <div class="color"></div>
-     <p class="colorlabel"></p>
-=======
-     <div class="color" id="colorbox10"></div>
-     <p class="colorlabel" id="colorcode10"></p>
->>>>>>> 3b8d586f83e00f953e7691702f949f462e836bdc
+    <div class="three columns">
+      <div class="outline-color">
+        <div class="color"></div>
+        <p class="colorlabel"></p>
+      </div>
    </div>
-</div>
-<div class="three columns">
-  <div class="outline-color">
-<<<<<<< HEAD
-    <div class="color"></div>
-    <p class="colorlabel"></p>
-=======
-    <div class="color" id="colorbox11"></div>
-    <p class="colorlabel" id="colorcode11"></p>
->>>>>>> 3b8d586f83e00f953e7691702f949f462e836bdc
   </div>
-</div>
-</div>
-<div class="row">
-   <div class="three columns">
-     <div class="outline-color">
-<<<<<<< HEAD
-       <div class="color"></div>
-       <p class="colorlabel"></p>
-=======
-       <div class="color" id="colorbox12"></div>
-       <p class="colorlabel" id="colorcode12"></p>
->>>>>>> 3b8d586f83e00f953e7691702f949f462e836bdc
+
+  <div class="row">
+       <div class="three columns">
+         <div class="outline-color">
+           <div class="color"></div>
+           <p class="colorlabel"></p>
+         </div>
+      </div>
+      <div class="three columns">
+        <div class="outline-color">
+          <div class="color"></div>
+          <p class="colorlabel"></p>
+        </div>
      </div>
-  </div>
-  <div class="three columns">
-    <div class="outline-color">
-<<<<<<< HEAD
-      <div class="color"></div>
-      <p class="colorlabel"></p>
-=======
-      <div class="color" id="colorbox13"></div>
-      <p class="colorlabel" id="colorcode13"></p>
->>>>>>> 3b8d586f83e00f953e7691702f949f462e836bdc
+     <div class="three columns">
+       <div class="outline-color">
+         <div class="color"></div>
+         <p class="colorlabel"></p>
+       </div>
     </div>
- </div>
- <div class="three columns">
-   <div class="outline-color">
-<<<<<<< HEAD
-     <div class="color"></div>
-     <p class="colorlabel"></p>
-=======
-     <div class="color" id="colorbox14"></div>
-     <p class="colorlabel" id="colorcode14"></p>
->>>>>>> 3b8d586f83e00f953e7691702f949f462e836bdc
+    <div class="three columns">
+      <div class="outline-color">
+        <div class="color"></div>
+        <p class="colorlabel"></p>
+      </div>
    </div>
-</div>
-<div class="three columns">
-  <div class="outline-color">
-<<<<<<< HEAD
-    <div class="color" ></div>
-    <p class="colorlabel"></p>
-=======
-    <div class="color" id="colorbox15"></div>
-    <p class="colorlabel" id="colorcode15"></p>
->>>>>>> 3b8d586f83e00f953e7691702f949f462e836bdc
   </div>
-</div>
-</div>
-