diff --git a/client/app/src/main/java/customUI/Button.java b/client/app/src/main/java/customUI/Button.java
index 61df976..5aefb5d 100644
--- a/client/app/src/main/java/customUI/Button.java
+++ b/client/app/src/main/java/customUI/Button.java
@@ -1,3 +1,4 @@
+//Marc Beyer//
 package customUI;
 
 public class Button extends javafx.scene.control.Button {
diff --git a/client/app/src/main/java/customUI/Converter.java b/client/app/src/main/java/customUI/Converter.java
index dc737af..bb89c59 100644
--- a/client/app/src/main/java/customUI/Converter.java
+++ b/client/app/src/main/java/customUI/Converter.java
@@ -1,3 +1,4 @@
+//Marc Beyer//
 package customUI;
 
 public class Converter {
diff --git a/client/app/src/main/java/customUI/Label.java b/client/app/src/main/java/customUI/Label.java
index ad5321e..546502d 100644
--- a/client/app/src/main/java/customUI/Label.java
+++ b/client/app/src/main/java/customUI/Label.java
@@ -1,3 +1,4 @@
+//Marc Beyer//
 package customUI;
 
 public class Label extends javafx.scene.control.Label {
diff --git a/client/app/src/main/java/customUI/Tooltip.java b/client/app/src/main/java/customUI/Tooltip.java
index 2a5324a..77bd78e 100644
--- a/client/app/src/main/java/customUI/Tooltip.java
+++ b/client/app/src/main/java/customUI/Tooltip.java
@@ -1,3 +1,4 @@
+//Marco Kühn//
 package customUI;
 
 public class Tooltip extends javafx.scene.control.Tooltip {
diff --git a/client/app/src/main/java/helper/SvgBtnCreator.java b/client/app/src/main/java/helper/SvgBtnCreator.java
index c9546fe..6cf614f 100644
--- a/client/app/src/main/java/helper/SvgBtnCreator.java
+++ b/client/app/src/main/java/helper/SvgBtnCreator.java
@@ -1,3 +1,4 @@
+//Marco Kühn//
 package helper;
 
 import javafx.geometry.Bounds;
diff --git a/client/app/src/main/java/main/CreateEventController.java b/client/app/src/main/java/main/CreateEventController.java
index e36cd4a..6eb5d06 100644
--- a/client/app/src/main/java/main/CreateEventController.java
+++ b/client/app/src/main/java/main/CreateEventController.java
@@ -42,6 +42,7 @@ public class CreateEventController {
     public CreateEventController() {
     }
 
+    //Marco Kühn//
     @FXML
     public void initialize() {
 
@@ -53,7 +54,7 @@ public class CreateEventController {
         timeEnd.setConverter(defaultConverter);
     }
 
-
+    //Marc Beyer//
     @FXML
     protected void createBtnClick(ActionEvent actionEvent) {
         try {
@@ -85,11 +86,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();
diff --git a/client/app/src/main/java/main/EditEventController.java b/client/app/src/main/java/main/EditEventController.java
index 58d1ea6..aa2fb1e 100644
--- a/client/app/src/main/java/main/EditEventController.java
+++ b/client/app/src/main/java/main/EditEventController.java
@@ -1,3 +1,4 @@
+//Marc Beyer//
 package main;
 
 import customUI.Converter;
diff --git a/client/app/src/main/java/main/MainApplication.java b/client/app/src/main/java/main/MainApplication.java
index 09274f4..7daa65c 100644
--- a/client/app/src/main/java/main/MainApplication.java
+++ b/client/app/src/main/java/main/MainApplication.java
@@ -1,3 +1,4 @@
+//Marc Beyer//
 package main;
 
 import config.Config;
@@ -12,6 +13,7 @@ import res.HttpRequest;
 import java.io.IOException;
 import java.util.Objects;
 
+
 public class MainApplication extends Application {
     @Override
     public void start(Stage stage) throws IOException {
diff --git a/client/app/src/main/java/main/MainController.java b/client/app/src/main/java/main/MainController.java
index dbc8948..feda480 100644
--- a/client/app/src/main/java/main/MainController.java
+++ b/client/app/src/main/java/main/MainController.java
@@ -58,6 +58,7 @@ public class MainController {
     }
 
     @FXML
+    //Marco Kühn,Marc Beyer//
     public void initialize() {
         createWeek();
         setDates();
@@ -66,6 +67,7 @@ public class MainController {
         leftNav.setSpacing(40);
     }
 
+    //Marc Beyer//
     private void updateEvents() {
         for (VBox vBox : dayVBoxes) {
             vBox.getChildren().clear();
@@ -83,6 +85,7 @@ public class MainController {
         }
     }
 
+    //Marc Beyer//
     @FXML
     protected void onBackClick() {
         weekOffset--;
@@ -90,6 +93,7 @@ public class MainController {
         updateEvents();
     }
 
+    //Marc Beyer//
     @FXML
     protected void onTodayClick() {
         weekOffset = 0;
@@ -97,6 +101,7 @@ public class MainController {
         updateEvents();
     }
 
+    //Marc Beyer//
     @FXML
     protected void onNextClick() {
         weekOffset++;
@@ -104,6 +109,8 @@ public class MainController {
         updateEvents();
     }
 
+
+    //Marco Kühn,Marc Beyer//
     @FXML
     protected void onAddBtnClick() {
         try {
@@ -125,10 +132,12 @@ public class MainController {
         updateEvents();
     }
 
+    //Marco Kühn//
     protected void onSettingBtnClick(){
 
     }
 
+    //Marc Beyer//
     protected void onLogoutBtnClick(ActionEvent event){
         ConfigLoader.save(new Config());
         DataController.USER_ID = -1;
@@ -137,6 +146,7 @@ public class MainController {
         stage.close();
     }
 
+    //Marc Beyer//
     private void createWeek() {
         for (int i = 0; i < 7; i++) {
             Label label = new Label();
@@ -164,6 +174,7 @@ public class MainController {
         }
     }
 
+    //Marco Kühn ,Marc Beyer//
     private void addEvent(Event event) {
         VBox vBox = new VBox();
         vBox.getStyleClass().add("event");
@@ -253,6 +264,7 @@ public class MainController {
         }
     }
 
+    //Marc Beyer//
     private String formatTime(String time) {
         String[] timeArr = time.split(":");
         if (timeArr.length > 2) {
@@ -261,6 +273,7 @@ public class MainController {
         return time;
     }
 
+    //Marc Beyer//
     private void setDates() {
         DateTimeFormatter dateFormatter = DateTimeFormatter.ofPattern("LLLL yyyy");
         DateTimeFormatter dayFormatter = DateTimeFormatter.ofPattern("E dd.MM");
@@ -279,6 +292,7 @@ public class MainController {
 
     }
 
+    //Marco Kühn//
     private void createBtns(){
         Group svgAdd = new Group(
                 SvgBtnCreator.createPath("M0 0h24v24H0z", "transparent", "transparent"),
diff --git a/client/app/src/main/java/users/CreateUserController.java b/client/app/src/main/java/users/CreateUserController.java
index 3f54a46..aa39bee 100644
--- a/client/app/src/main/java/users/CreateUserController.java
+++ b/client/app/src/main/java/users/CreateUserController.java
@@ -1,3 +1,4 @@
+//Alex Rechtin//
 package users;
 
 import javafx.event.ActionEvent;
diff --git a/client/app/src/main/java/users/LoginController.java b/client/app/src/main/java/users/LoginController.java
index 3bce950..569073d 100644
--- a/client/app/src/main/java/users/LoginController.java
+++ b/client/app/src/main/java/users/LoginController.java
@@ -1,3 +1,4 @@
+//Alex Rechtin//
 package users;
 
 import com.jfoenix.controls.*;
diff --git a/client/app/src/main/resources/main/create-event.css b/client/app/src/main/resources/main/create-event.css
index be03557..817e88c 100644
--- a/client/app/src/main/resources/main/create-event.css
+++ b/client/app/src/main/resources/main/create-event.css
@@ -1,3 +1,4 @@
+/*Marco Kühn*/
 GridPane{
     -fx-background-color: #3E415F;
     -fx-padding: 20px;
diff --git a/client/app/src/main/resources/main/create-event.fxml b/client/app/src/main/resources/main/create-event.fxml
index e2798db..706ff51 100644
--- a/client/app/src/main/resources/main/create-event.fxml
+++ b/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.*?>
 
diff --git a/client/app/src/main/resources/main/edit-event.fxml b/client/app/src/main/resources/main/edit-event.fxml
index 939dddb..00a1f33 100644
--- a/client/app/src/main/resources/main/edit-event.fxml
+++ b/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.*?>
 
diff --git a/client/app/src/main/resources/main/main-view.css b/client/app/src/main/resources/main/main-view.css
index 56d1402..3dcf8ac 100644
--- a/client/app/src/main/resources/main/main-view.css
+++ b/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;
diff --git a/client/app/src/main/resources/main/main-view.fxml b/client/app/src/main/resources/main/main-view.fxml
index 8f2d3f8..5cd69e3 100644
--- a/client/app/src/main/resources/main/main-view.fxml
+++ b/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.*?>
diff --git a/client/app/src/main/resources/users/create-user.css b/client/app/src/main/resources/users/create-user.css
index 6d2ca93..2d13534 100644
--- a/client/app/src/main/resources/users/create-user.css
+++ b/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;
diff --git a/client/app/src/main/resources/users/create-user.fxml b/client/app/src/main/resources/users/create-user.fxml
index e542f73..629309d 100644
--- a/client/app/src/main/resources/users/create-user.fxml
+++ b/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?>
diff --git a/client/app/src/main/resources/users/login.css b/client/app/src/main/resources/users/login.css
index 687435b..963c6b6 100644
--- a/client/app/src/main/resources/users/login.css
+++ b/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;
diff --git a/client/app/src/main/resources/users/login.fxml b/client/app/src/main/resources/users/login.fxml
index 9356f08..711054b 100644
--- a/client/app/src/main/resources/users/login.fxml
+++ b/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.*?>
diff --git a/client/data/src/main/java/config/Config.java b/client/data/src/main/java/config/Config.java
index 07e8b2f..ce4b5e8 100644
--- a/client/data/src/main/java/config/Config.java
+++ b/client/data/src/main/java/config/Config.java
@@ -1,3 +1,4 @@
+//Marc Beyer//
 package config;
 
 public class Config {
diff --git a/client/data/src/main/java/config/ConfigLoader.java b/client/data/src/main/java/config/ConfigLoader.java
index 56e195e..85af735 100644
--- a/client/data/src/main/java/config/ConfigLoader.java
+++ b/client/data/src/main/java/config/ConfigLoader.java
@@ -1,3 +1,4 @@
+//Marc Beyer//
 package config;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
diff --git a/client/data/src/main/java/helper/HttpRequestException.java b/client/data/src/main/java/helper/HttpRequestException.java
index 972dd3f..1734ddc 100644
--- a/client/data/src/main/java/helper/HttpRequestException.java
+++ b/client/data/src/main/java/helper/HttpRequestException.java
@@ -1,3 +1,4 @@
+//Marc Beyer//
 package helper;
 
 public class HttpRequestException extends Exception{
diff --git a/client/data/src/main/java/helper/Tuple.java b/client/data/src/main/java/helper/Tuple.java
index e342ad6..5ae234e 100644
--- a/client/data/src/main/java/helper/Tuple.java
+++ b/client/data/src/main/java/helper/Tuple.java
@@ -1,3 +1,4 @@
+//Marc Beyer//
 package helper;
 
 public class Tuple<X, Y> {
diff --git a/client/data/src/main/java/res/DataController.java b/client/data/src/main/java/res/DataController.java
index f920bac..bc9930b 100644
--- a/client/data/src/main/java/res/DataController.java
+++ b/client/data/src/main/java/res/DataController.java
@@ -1,3 +1,4 @@
+//Marc Beyer//
 package res;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
diff --git a/client/data/src/main/java/res/Event.java b/client/data/src/main/java/res/Event.java
index efabe57..33a6515 100644
--- a/client/data/src/main/java/res/Event.java
+++ b/client/data/src/main/java/res/Event.java
@@ -1,3 +1,4 @@
+//Marc Beyer//
 package res;
 
 import com.sun.jdi.event.StepEvent;
diff --git a/client/data/src/main/java/res/HttpRequest.java b/client/data/src/main/java/res/HttpRequest.java
index 311fad4..cc4b46e 100644
--- a/client/data/src/main/java/res/HttpRequest.java
+++ b/client/data/src/main/java/res/HttpRequest.java
@@ -1,3 +1,4 @@
+//Marc Beyer//
 package res;
 
 import helper.Tuple;