diff --git a/src/main/resources/Images/vector1.jpg b/src/main/resources/Images/vector1.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..40b88b1a7fddb172b56899c7385ecee3c20cb8e2
Binary files /dev/null and b/src/main/resources/Images/vector1.jpg differ
diff --git a/src/main/resources/NTNU/IDATT1002/signup.fxml b/src/main/resources/NTNU/IDATT1002/signup.fxml
index 7d8bb5ab37980fc7660e1c7e4ed992bf852009a3..3cb5f6fb31f7ee0c9e2c9838ae2977ed014b0bb8 100644
--- a/src/main/resources/NTNU/IDATT1002/signup.fxml
+++ b/src/main/resources/NTNU/IDATT1002/signup.fxml
@@ -5,11 +5,8 @@
 <?import javafx.scene.layout.*?>
 <?import javafx.scene.text.*?>
 
-<<<<<<< src/main/resources/NTNU/IDATT1002/signup.fxml
-<VBox alignment="CENTER" prefHeight="1080.0" prefWidth="1920.0" spacing="20.0" xmlns="http://javafx.com/javafx/11.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="NTNU.IDATT1002.controllers.SignUp">
-=======
+
 <VBox alignment="CENTER" prefHeight="400.0" prefWidth="600.0" spacing="20.0" xmlns="http://javafx.com/javafx/10.0.2-internal" xmlns:fx="http://javafx.com/fxml/1" fx:controller="NTNU.IDATT1002.controllers.SignUp">
->>>>>>> src/main/resources/NTNU/IDATT1002/signup.fxml
     <children>
         <Label text="Sign Up page">
          <font>
diff --git a/src/main/resources/NTNU/IDATT1002/style.css b/src/main/resources/NTNU/IDATT1002/style.css
new file mode 100644
index 0000000000000000000000000000000000000000..aa2d21cf77f47fb8e2957c3d735ca0b98db02355
--- /dev/null
+++ b/src/main/resources/NTNU/IDATT1002/style.css
@@ -0,0 +1,23 @@
+
+.bodybg{
+    -fx-background-image: url("../../Images/vector1.jpg");
+    -fx-background-size: cover;
+}
+
+.signupbg{
+    -fx-background-color: #10101f;
+}
+
+.button{
+    -fx-transition-duration: 0.4s;
+    -fx-background-color: blank;
+    -fx-border-width: 2px;
+    -fx-border-color: white;
+    -fx-color: white;
+
+}
+
+.button:hover{
+    -fx-background-color: rgba(193, 198, 196, 0.5);
+    -fx-color: white;
+}
\ No newline at end of file