Merge Conflict solved in medias

README.md

-# HCI hub.io
-# hub.io is an aggregate of online streaming services such as Netflix, Hulu, Amazon Prime Video, etc. This application will allow every user’s subscription services for online video streaming to be in one concise place. This service will help save time and keep everyone’s subscription services side by side for easy searchability and comparability. This will prevent users from having to switch out of certain streaming services to try to find a particular tv show or movie.
+# hub.io
+Hub.io is an aggregate of online streaming services such as Netflix, Hulu, Amazon Prime Video, etc. This application will allow every user’s subscription services for online video streaming to be in one concise place. This service will help save time and keep everyone’s subscription services side by side for easy searchability and comparability. This will prevent users from having to switch out of certain streaming services to try to find a particular tv show or movie.
+
+This project was initially started for our HCI class, however we enjoyed the project, so we decided to work on it further.
+
+*Note: This is a GUI prototype, so functionality does not exist.*
+
+###### (Currently only works in Google Chrome in Desktop, we are working on making it more flexible for multiple platforms).
+
+---
+
+*Created by Peyton Tanzillo, Joey Ballentine, Samir Kashyap, and Braydon Clyde*
\ No newline at end of file

medias.js

@@ -309,7 +309,7 @@ const Avengers = new Media(
     'Earth\'s mightiest heroes must come together and learn to fight as a team if\
      they are going to stop the mischievous Loki and his alien army from enslaving humanity.',
     [new Season(1)], // 1 season, 1 episode = movie
-    ['Netflix'],
+    ['Prime Video'],
     'Content/Avengers.jpg',
     'avengers');
 
@@ -323,7 +323,7 @@ const BlackPanther = new Media(
      conflict that puts the fate of Wakanda and the entire world at risk. Faced with treachery and danger, the young king must rally his allies\
      and release the full power of Black Panther to defeat his foes and secure the safety of his people.',
     [new Season(1)], // 1 season, 1 episode = movie
-    ['Netflix'],
+    ['Netflix', 'Prime Video'],
     'Content/black-panther.jpg',
     'blackpanther');
 
@@ -465,10 +465,49 @@ const ZeroDarkThirty = new Media(
     'Content/zerodarkthirty.jpg',
     'zerodarkthirty');
 
+const ET = new Media(
+    'E.T. the Extra-Terrestrial',
+    8,
+    ['drama'],
+    '1982',
+    'After a gentle alien becomes stranded on Earth, the being is discovered and befriended by a young boy named Elliott (Henry Thomas). Bringing the \
+    extraterrestrial into his suburban California house, Elliott introduces E.T., as the alien is dubbed, to his brother and his little sister, Gertie \
+    (Drew Barrymore), and the children decide to keep its existence a secret. Soon, however, E.T. falls ill, resulting in government intervention and a \
+    dire situation for both Elliott and the alien.',
+    [new Season(1)], // 1 season, 1 episode = movie
+    ['HBO GO', 'Prime Video'],
+    'Content/et.jpg',
+    'et');
+
+const DaysOfSummmer = new Media(
+    '500 Days of Summer',
+    7,
+    ['romance', 'drama'],
+    '2009',
+    'Tom (Joseph Gordon-Levitt), greeting-card writer and hopeless romantic, is caught completely off-guard when his girlfriend, Summer (Zooey Deschanel), \
+    suddenly dumps him. He reflects on their 500 days together to try to figure out where their love affair went sour, and in doing so, Tom rediscovers his \
+    true passions in life.',
+    [new Season(1)], // 1 season, 1 episode = movie
+    ['HBO GO', 'Prime Video'],
+    'Content/500days.jpg',
+    '500daysofsummer');
+
+const DevilWearsPrada = new Media(
+    'The Devil Wears Prada',
+    7,
+    ['romance', 'drama', 'comedy'],
+    '2006',
+    'Andy (Anne Hathaway) is a recent college graduate with big dreams. Upon landing a job at prestigious Runway magazine, she finds herself the assistant \
+    to diabolical editor Miranda Priestly (Meryl Streep). Andy questions her ability to survive her grim tour as Miranda\'s whipping girl without getting scorched.',
+    [new Season(1)], // 1 season, 1 episode = movie
+    ['HBO GO', 'Prime Video'],
+    'Content/prada.jpg',
+    'thedevilwearsprada');
+
 const Medias = [TheOffice, SouthPark, DragonBallZ, Dark, WestWorld, HighCastle, SpongeBob, Friends, GameOfThrones, Shameless, Avengers, BlackPanther,
   BeastsOfNoNation, TwentyWeeks, StarTrekIntoDarkness, TheDarkKnight, TheDarkKnightRises, ThorDarkWorld, ZeroDarkThirty, MissKobayashisDragonMaid,
   Megalobox, CowboyBebop, ATLA, Konosuba, StrangerThings, RickAndMorty, Homeland, FiveCentimetersPerSecond, DarkWasTheNight, HoldTheDark, Arrival,
-  FamilyGuy,
+  FamilyGuy, ET, DaysOfSummmer, DevilWearsPrada,
 ];
 
 function compare(a, b) {

style.css

@@ -46,6 +46,7 @@
   margin-right: 40px;
   height: 10px;
   width: 25%;
+  border-radius: 20px;
 }
 
 #search-box {