diff --git a/10/index.html b/10/index.html
index 0bab468..744aa2f 100644
--- a/10/index.html
+++ b/10/index.html
@@ -171,8 +171,13 @@ Being sensibilized, gaining awareness and gradually understanding the structures
 		<a href="#mark_module"> <div id="mark_T" class="moduletext"><h1 class="name_T">FLAKES</h1></div></a>
 		<h2 class="student">by Mark van den Heuvel</h2>
 
+<<<<<<< HEAD
 		<p>>Flakes is an audio playback device that combines the functionalities of an analog cassette tape player and a digital sample playback module1. Merged together in the case of an old desktop cassette recorder, this hybrid machine allows both different audio playback techniques to consolidate each other’s technical limitations, make use (and abuse ? misuse) of their capabilities in order to emphasize their ‘unique’ characteristics.
 	<br>By connecting the available outputs to inputs and using the adjustable knobs on the interface, the user has the options to mix, modify and let the samples from both analog and digital sources interact with each other to create new, unexpected sounds.
+=======
+		<p>Flakes is an audio playback device that combines the functionalities of an analog cassette tape player and a digital sample playback module1. Merged together in the case of an old desktop cassette recorder, this hybrid machine allows both different audio playback techniques to consolidate each other’s technical limitations, make use (and abuse ? misuse) of their capabilities in order to emphasize their ‘unique’ characteristics.
+	<br>By connecting the available outputs to inputs and using the adjustable knobs on the interface, the user has the options to mix, modify and let the samples from both analog and digital sources interact with each other to create new, unexpected sounds. 
+>>>>>>> 270efebe3f2a311d927606dcf11d722a7fcf4921
 	<br> >Note 1: Despite both only being capable of playing lo-fi** samples, the analog device can make recordings and play them back directly and the digital module's behavior is fully programmable, allowing to make use of feedback, phasing, gate triggers, pitch control functions, and configurable functionalities as desired and more.
 	<br>How it works: A speech sample (saying IN-SIDE OUT) is cut into pieces so the separate words can be divided to the digital module (programmed onto) and analog tape loop* (recorded onto its magnetic tape). While the analog tape loop is prominent and continuously plays the same slice, the digital module runs a program that allows the recorded sample to (start playback on a trigger and) jump between different starting positions and loop sizes start playback. Played together, random flakes and new combinations of the separate words are constantly being generated in real-time. They correct and complement each other, making new combinations of the 3 words: IN-SIDE-OUT.</p>
 		<button type="button" class="collapsible">Read More</button>
diff --git a/10/script.js b/10/script.js
index d8cc78f..77d1a68 100644
--- a/10/script.js
+++ b/10/script.js
@@ -1,6 +1,17 @@
+function adjust_height(){
+    var win_height = $(window).height();
+	$('div#left, div#right').css('height', (win_height- (win_height/100)) ); //
+	// console.log(win_height);
+}
+
 $(document).ready(function(){
 
+	adjust_height()
 /* hidden Manual, Git links until manual as uploaded and git dir are ready */
-$('div.links > a:contains("Manual")').css('display', 'none');
-$('div.links > a:contains("Git")').css('display', 'none');
-})
\ No newline at end of file
+// $('div.links > a:contains("Manual")').css('display', 'none');
+// $('div.links > a:contains("Git")').css('display', 'none');
+})
+
+$(window).resize(function(){
+	adjust_height();
+})
diff --git a/10/style.css b/10/style.css
index be7f712..6502409 100644
--- a/10/style.css
+++ b/10/style.css
@@ -84,20 +84,22 @@ div#left {
   margin-left: auto;
   margin-right: auto;
   height:700px;
-  overflow: scroll;
-  padding-bottom: 200px;
+  overflow-y: scroll;
+  /*! padding-bottom: 200px; */
   background-color: white;
+  /*! padding-left: 5px; */
+  /*! padding-right: 5px; */
 }
 
 div#right {
   border: none;
-  width:49%;
+  width:50%;
   display: inline-block;
   margin-left: auto;
   margin-right: auto;
   height:700px;
-  overflow: scroll;
-  padding-bottom: 200px;
+  overflow-y: scroll;
+  /*! padding-bottom: 200px; */
   background-color: #21632c;
 }
 
@@ -223,7 +225,7 @@ div#names {
   max-width: 90%;
   /*! text-align: justify; */
   display: block;
-    margin-left: auto;
+    margin-left: 1vw;
     margin-right: auto;
     font-family: "OCRAStd";
     font-style: "light";
@@ -267,7 +269,7 @@ div#bigpcb{
 }
 
 .bigpcb{
-  width: 90%;
+  width: 100%;
   height: auto;
     margin-left: auto;
     margin-right: auto;