Merge finished

src/main/java/de/uniluebeck/mi/projmi6/controller/DiagnoseController.java

@@ -3,6 +3,8 @@ package de.uniluebeck.mi.projmi6.controller;
 /**
  * Created by 631806 on 12.11.15.
  */
+
+import javafx.event.ActionEvent;
 import javafx.fxml.FXML;
 import javafx.scene.control.Button;
 import javafx.event.ActionEvent;

src/main/java/de/uniluebeck/mi/projmi6/model/Patient.java

@@ -0,0 +1,18 @@
+package de.uniluebeck.mi.projmi6.model;
+
+import javafx.beans.property.SimpleStringProperty;
+
+/**
+ * Created by 626947 on 12.11.15.
+ */
+public class Patient {
+    private SimpleStringProperty vorname;
+    private SimpleStringProperty nachname;
+    private SimpleStringProperty geburtsname;
+    private SimpleStringProperty strasse;
+    private SimpleStringProperty hausnummer;
+    private SimpleStringProperty plz;
+    private SimpleStringProperty ort;
+
+
+}