Commit the new Files

# Conflicts:
#	client/app/src/main/java/customUI/Button.java
#	client/app/src/main/java/customUI/Converter.java
#	client/app/src/main/java/customUI/Label.java
#	client/app/src/main/java/customUI/Tooltip.java
#	client/app/src/main/java/events/EditEventController.java
#	client/app/src/main/java/helper/SvgBtnCreator.java
#	client/app/src/main/java/main/MainController.java
#	client/data/src/main/java/container/Event.java
#	client/data/src/main/java/res/DataController.java
#	client/data/src/main/java/res/HttpRequest.java

client/app/src/main/java/events/CreateEventController.java

@@ -42,6 +42,7 @@ public class CreateEventController {
     public CreateEventController() {
     }
 
+    //Marco Kühn//
     @FXML
     public void initialize() {
         StringConverter<LocalTime> defaultConverter = new LocalTimeStringConverter(FormatStyle.SHORT, Locale.GERMANY);
@@ -52,7 +53,7 @@ public class CreateEventController {
         timeEnd.setConverter(defaultConverter);
     }
 
-
+    //Marc Beyer//
     @FXML
     protected void createBtnClick(ActionEvent actionEvent) {
         try {
@@ -84,11 +85,13 @@ public class CreateEventController {
         }
     }
 
+    //Marc Beyer//
     protected void sendHttpRequest(Event event) throws HttpRequestException {
         DataController dataController = new DataController();
         dataController.createEvent(event);
     }
 
+    //Marc Beyer//
     @FXML
     protected void abortBtnClick(ActionEvent event) {
         Stage stage = (Stage) ((Node) event.getSource()).getScene().getWindow();

client/app/src/main/java/main/MainApplication.java

@@ -1,3 +1,4 @@
+//Marc Beyer//
 package main;
 
 import config.Config;
@@ -14,6 +15,7 @@ import java.io.IOException;
 import java.util.Objects;
 import java.util.function.Consumer;
 
+
 public class MainApplication extends Application {
     @Override
     public void start(Stage stage) throws IOException {

client/app/src/main/java/main/MainController.java

@@ -1,3 +1,4 @@
+/* Marco Kühn, Marc Beyer */
 package main;
 
 import config.Config;

client/app/src/main/java/main/OptionController.java

@@ -1,3 +1,4 @@
+/* Marco Kühn */
 package main;
 
 import com.jfoenix.controls.*;

client/app/src/main/java/users/CreateUserController.java

@@ -1,3 +1,4 @@
+//Alex Rechtin//
 package users;
 
 import helper.HttpRequestException;

client/app/src/main/java/users/EditUserController.java

@@ -1,3 +1,4 @@
+/* Marc Beyer */
 package users;
 
 import container.DataController;

client/app/src/main/java/users/LoginController.java

@@ -1,3 +1,4 @@
+//Alex Rechtin//
 package users;
 
 import com.jfoenix.controls.*;

client/app/src/main/resources/main/create-event.css

@@ -1,3 +1,4 @@
+/*Marco Kühn*/
 GridPane{
     -fx-background-color: #3E415F;
     -fx-padding: 20px;

client/app/src/main/resources/main/create-event.fxml

@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
+<!-- Marco Kühn -->
+
 <?import javafx.scene.control.*?>
 <?import javafx.scene.layout.*?>
 

client/app/src/main/resources/main/edit-event.fxml

@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
+<!-- Marco Kühn -->
+
 <?import javafx.scene.control.*?>
 <?import javafx.scene.layout.*?>
 

client/app/src/main/resources/main/main-view.css

@@ -1,3 +1,4 @@
+/*Alex Rechtin, Marco Kühn*/
 * {
    -fx-base-background-color: #2B2D42;
    -fx-base1-background-color: #525E74;

client/app/src/main/resources/main/main-view.fxml

@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
+<!-- Alex Rechtin, Marco Kühn -->
+
 <?import javafx.geometry.*?>
 <?import javafx.scene.control.*?>
 <?import javafx.scene.image.*?>

client/app/src/main/resources/main/option-view.css

@@ -1,3 +1,4 @@
+/* Marco Kühn */
 GridPane{
     -fx-background-color: #3E415F;
     -fx-padding: 20px;

client/app/src/main/resources/main/option-view.fxml

@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- Marco Kühn -->
 
 <?import javafx.scene.control.*?>
 <?import javafx.scene.layout.*?>

client/app/src/main/resources/users/create-user.css

@@ -1,3 +1,4 @@
+/*Alex Rechtin*/
 * {
    -fx-base-background-color: #2B2D42;
    -fx-base1-background-color: #525E74;

client/app/src/main/resources/users/create-user.fxml

@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
+<!-- Alex Rechtin -->
+
 <?import javafx.scene.control.*?>
 <?import javafx.scene.layout.*?>
 <?import javafx.geometry.Insets?>

client/app/src/main/resources/users/login.css

@@ -1,3 +1,4 @@
+/* Marco Kühn*/
 * {
    -fx-base-background-color: #2B2D42;
    -fx-base1-background-color: #525E74;

client/app/src/main/resources/users/login.fxml

@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
+<!-- Marco Kühn -->
+
 <?import javafx.scene.control.*?>
 <?import javafx.scene.layout.*?>
 <?import com.jfoenix.controls.*?>

client/data/src/main/java/config/Config.java

@@ -1,3 +1,4 @@
+//Marc Beyer//
 package config;
 
 public class Config {

client/data/src/main/java/config/ConfigLoader.java

@@ -1,3 +1,4 @@
+//Marc Beyer//
 package config;
 
 import com.fasterxml.jackson.databind.ObjectMapper;

client/data/src/main/java/helper/HttpRequestException.java

@@ -1,3 +1,4 @@
+//Marc Beyer//
 package helper;
 
 public class HttpRequestException extends Exception{

client/data/src/main/java/helper/Tuple.java

@@ -1,3 +1,4 @@
+//Marc Beyer//
 package helper;
 
 public class Tuple<X, Y> {