cleaned css

static/css/style.css

@@ -1,10 +1,4 @@
-<<<<<<< HEAD
-html {
-  background-color: gray;
-}
 
-=======
->>>>>>> 8b9db01a45a2a649684b6c229c428187d4edaf29
 #video1 {
   margin-top: 300px;
 }
@@ -28,8 +22,6 @@ img {
   margin-left: 400px;
 }
 
-<<<<<<< HEAD
-/* audio and pop up images */
 #transcriptWrapper {
   overflow: hidden;
 }
@@ -41,7 +33,8 @@ img {
 
 .speaking {
   font-weight: bold;
-=======
+}
+
 #background_a {
   background-image: url("../images/map.png");
   background-repeat: no-repeat;
@@ -62,5 +55,4 @@ img {
 #background_c {
   background-image: url("../images/test2_opacity.jpeg");
 
->>>>>>> 8b9db01a45a2a649684b6c229c428187d4edaf29
 }